tods-competition-factory 1.8.22 → 1.8.24

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

@@ -2905,7 +2905,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.8.22';
+    return '1.8.24';
 }
 
 function getObjectTieFormat(obj) {
@@ -4904,7 +4904,7 @@ function getTallyReport(_a) {
     var readable = [];
     if (Array.isArray(report)) {
         report.forEach(function (step, i) {
-            var _a;
+            var _a, _b, _c;
             if ((_a = step.excludedDirectives) === null || _a === void 0 ? void 0 : _a.length) {
                 var attributes = step.excludedDirectives
                     .map(function (_a) {
@@ -4921,20 +4921,24 @@ function getTallyReport(_a) {
                 var floatSort_1 = function (a, b) {
                     return parseFloat(step.reversed ? a : b) - parseFloat(step.reversed ? b : a);
                 };
+                var participantsCount = step.groups
+                    ? Object.values(step.groups).flat(Infinity).length
+                    : (_c = (_b = step.participantIds) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
                 var getExplanation = function (step) {
-                    Object.keys(step.groups)
-                        .sort(floatSort_1)
-                        .forEach(function (key) {
-                        var participantNames = step.groups[key]
-                            .map(function (participantId) { return participants[participantId]; })
-                            .join(', ');
-                        var explanation = "".concat(key, " ").concat(step.attribute, ": ").concat(participantNames);
-                        readable.push(explanation);
-                    });
+                    step.groups &&
+                        Object.keys(step.groups)
+                            .sort(floatSort_1)
+                            .forEach(function (key) {
+                            var participantNames = step.groups[key]
+                                .map(function (participantId) { return participants[participantId]; })
+                                .join(', ');
+                            var explanation = "".concat(key, " ").concat(step.attribute, ": ").concat(participantNames);
+                            readable.push(explanation);
+                        });
                 };
                 var reversed = step.reversed ? ' in reverse order' : '';
-                var participantsCount = Object.values(step.groups).flat(Infinity).length;
-                var description = "Step ".concat(i + 1, ": ").concat(participantsCount, " particiants were grouped").concat(reversed, " by ").concat(step.attribute);
+                var action = step.groups ? 'grouped' : 'separated';
+                var description = "Step ".concat(i + 1, ": ").concat(participantsCount, " particiants were ").concat(action).concat(reversed, " by ").concat(step.attribute);
                 readable.push(description);
                 if (step.idsFilter) {
                     var note = "".concat(step.attribute, " was calculated considering ONLY TIED PARTICIPANTS");
@@ -4949,7 +4953,7 @@ function getTallyReport(_a) {
     order.forEach(function (orderEntry) {
         var participantId = orderEntry.participantId, resolved = orderEntry.resolved;
         var pOrder = orderEntry.groupOrder || orderEntry.provisionalOrder;
-        readable.push("".concat(pOrder, ": ").concat(participants[participantId], " => resolved: ").concat(resolved));
+        readable.push("".concat(pOrder, ": ").concat(participants[participantId], " => resolved: ").concat(!!resolved));
     });
     return readable.join('\r\n');
 }
@@ -5073,7 +5077,7 @@ function getGroupOrder(params) {
         .map(function (key) { return orderedTallyGroups[key]; })
         .map(function (participantIds) {
         var result = groupSubSort(__assign({ participantIds: participantIds }, params));
-        report.push(result.report);
+        report.push.apply(report, __spreadArray([], __read((result.report || [])), false));
         return result.order;
     })
         .flat(Infinity);
@@ -5182,7 +5186,7 @@ function processAttribute(_a) {
                 tallyPolicy: tallyPolicy,
                 matchUps: matchUps,
             });
-            report.push(result.report);
+            report.push.apply(report, __spreadArray([], __read((result.report || [])), false));
             return result.order;
         })
             .flat(Infinity);
@@ -5191,6 +5195,9 @@ function processAttribute(_a) {
 }
 function groupSubSort(_a) {
     var participantResults = _a.participantResults, disableHeadToHead = _a.disableHeadToHead, participantIds = _a.participantIds, matchUpFormat = _a.matchUpFormat, tallyPolicy = _a.tallyPolicy, matchUps = _a.matchUps;
+    var excludedDirectives = [];
+    var report = [];
+    var result;
     if ((participantIds === null || participantIds === void 0 ? void 0 : participantIds.length) === 1) {
         var participantId = participantIds[0];
         return {
@@ -5201,13 +5208,13 @@ function groupSubSort(_a) {
         (!(tallyPolicy === null || tallyPolicy === void 0 ? void 0 : tallyPolicy.headToHead) ||
             (!tallyPolicy.headToHead.disabled && !disableHeadToHead))) {
         var result_1 = headToHeadWinner({ participantIds: participantIds, participantResults: participantResults });
-        if (result_1)
-            return { order: [result_1], headToHeadWinner: result_1[0].participantId };
+        if (result_1) {
+            var headToHeadWinner_1 = result_1[0].participantId;
+            report.push({ attribute: 'head2Head', participantIds: participantIds, headToHeadWinner: headToHeadWinner_1 });
+            return { order: [result_1], headToHeadWinner: headToHeadWinner_1, report: report };
+        }
     }
     var directives = (tallyPolicy === null || tallyPolicy === void 0 ? void 0 : tallyPolicy.tallyDirectives) || headToHeadTallyDirectives;
-    var excludedDirectives = [];
-    var report = [];
-    var result;
     var filteredDirectives = directives.filter(function (directive) {
         // if maxParticipants is defined, filter out the rule if # of participants is greater than maxParticipants
         var keepDirective = isNumeric(directive.maxParticipants) &&
@@ -6007,11 +6014,12 @@ var scheduleConstants = {
 };
 
 function getMatchUpFormatTiming(_a) {
-    var _b = _a.defaultAverageMinutes, defaultAverageMinutes = _b === void 0 ? 90 : _b, _c = _a.defaultRecoveryMinutes, defaultRecoveryMinutes = _c === void 0 ? 0 : _c, tournamentRecord = _a.tournamentRecord, matchUpFormat = _a.matchUpFormat, categoryName = _a.categoryName, categoryType = _a.categoryType, eventType = _a.eventType, event = _a.event;
+    var _b;
+    var _c = _a.defaultAverageMinutes, defaultAverageMinutes = _c === void 0 ? 90 : _c, _d = _a.defaultRecoveryMinutes, defaultRecoveryMinutes = _d === void 0 ? 0 : _d, tournamentRecord = _a.tournamentRecord, matchUpFormat = _a.matchUpFormat, categoryName = _a.categoryName, categoryType = _a.categoryType, eventType = _a.eventType, event = _a.event;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     // event is optional, so eventType can also be passed in directly
-    eventType = eventType || (event === null || event === void 0 ? void 0 : event.eventType) || TypeEnum.Singles;
+    eventType = (_b = eventType !== null && eventType !== void 0 ? eventType : event === null || event === void 0 ? void 0 : event.eventType) !== null && _b !== void 0 ? _b : TypeEnum.Singles;
     var defaultTiming = {
         averageTimes: [{ minutes: { default: defaultAverageMinutes } }],
         recoveryTimes: [{ minutes: { default: defaultRecoveryMinutes } }],
@@ -6661,7 +6669,7 @@ function getVenuesAndCourts$1(_a) {
 }
 function findVenue(_a) {
     var e_1, _b;
-    var _c;
+    var _c, _d;
     var tournamentRecords = _a.tournamentRecords, tournamentRecord = _a.tournamentRecord, venueId = _a.venueId;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -6672,9 +6680,9 @@ function findVenue(_a) {
         return venueRecord.venueId === venueId ? venueRecord : venue;
     }, undefined);
     if (!venue && tournamentRecords) {
-        var linkedTournamentIds = getLinkedTournamentIds({
+        var linkedTournamentIds = (_d = getLinkedTournamentIds({
             tournamentRecords: tournamentRecords,
-        }).linkedTournamentIds || [];
+        }).linkedTournamentIds) !== null && _d !== void 0 ? _d : [];
         var relevantIds = linkedTournamentIds[tournamentRecord.tournamentId];
         try {
             // if there are linked tournaments search for court in all linked tournaments
@@ -7437,6 +7445,7 @@ var participantConstants = {
 };
 
 function getPairedParticipant(_a) {
+    var _b;
     var tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds;
     var stack = 'getPairedParticipant';
     if (!tournamentParticipants && !tournamentRecord)
@@ -7449,7 +7458,7 @@ function getPairedParticipant(_a) {
             stack: stack,
         });
     tournamentParticipants =
-        tournamentParticipants || (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [];
+        (_b = tournamentParticipants !== null && tournamentParticipants !== void 0 ? tournamentParticipants : tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var existingPairedParticipants = tournamentParticipants.filter(function (participant) {
         return participant.participantType === PAIR &&
             intersection(participantIds, participant.individualParticipantIds)
@@ -9239,6 +9248,7 @@ var POLICY_ROUND_NAMING_DEFAULT = (_a$h = {},
         policyName: 'Round Naming Default',
         namingConventions: {
             round: 'Round',
+            pre: 'Pre',
         },
         qualifyingFinishMap: {
             1: 'Final',
@@ -9269,9 +9279,9 @@ var POLICY_ROUND_NAMING_DEFAULT = (_a$h = {},
     _a$h);
 
 function getRoundContextProfile(_a) {
-    var _b, _c, _d, _e;
+    var _b, _c, _d, _e, _f, _g;
     var roundNamingPolicy = _a.roundNamingPolicy, drawDefinition = _a.drawDefinition, structure = _a.structure, matchUps = _a.matchUps;
-    var _f = getRoundMatchUps$1({ matchUps: matchUps }), roundProfile = _f.roundProfile, roundMatchUps = _f.roundMatchUps;
+    var _h = getRoundMatchUps$1({ matchUps: matchUps }), roundProfile = _h.roundProfile, roundMatchUps = _h.roundMatchUps;
     var structureAbbreviation = structure.structureAbbreviation, stage = structure.stage;
     var isAdHocStructure = isAdHoc({ structure: structure });
     var isLuckyStructure = isLucky({ structure: structure });
@@ -9279,10 +9289,6 @@ function getRoundContextProfile(_a) {
     var roundNamingProfile = {};
     var defaultRoundNamingPolicy = POLICY_ROUND_NAMING_DEFAULT[POLICY_TYPE_ROUND_NAMING];
     var isQualifying = structure.stage === QUALIFYING;
-    var qualifyingFinishgMap = isQualifying &&
-        ((roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.qualifyingFinishMap) ||
-            (defaultRoundNamingPolicy === null || defaultRoundNamingPolicy === void 0 ? void 0 : defaultRoundNamingPolicy.qualifyingFinishMap) ||
-            {});
     var qualifyingStageSequences = isQualifying
         ? Math.max.apply(Math, __spreadArray(__spreadArray([], __read(((_b = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) !== null && _b !== void 0 ? _b : [])
             .filter(function (structure) { return structure.stage === QUALIFYING; })
@@ -9290,11 +9296,11 @@ function getRoundContextProfile(_a) {
             var stageSequence = _a.stageSequence;
             return stageSequence !== null && stageSequence !== void 0 ? stageSequence : 1;
         })), false), [0], false)) : 0;
-    var preQualifyingSequence = qualifyingStageSequences
-        ? qualifyingStageSequences - (structure.stageSequence || 1) || ''
+    var preQualifyingSequence = ((_c = structure.stageSequence) !== null && _c !== void 0 ? _c : 1) < qualifyingStageSequences
+        ? (_d = structure.stageSequence) !== null && _d !== void 0 ? _d : 1
         : '';
     var preQualifyingAffix = preQualifyingSequence
-        ? ((_c = roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.affixes) === null || _c === void 0 ? void 0 : _c.preQualifying) ||
+        ? ((_e = roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.affixes) === null || _e === void 0 ? void 0 : _e.preQualifying) ||
             defaultRoundNamingPolicy.affixes.preQualifying ||
             ''
         : '';
@@ -9304,9 +9310,9 @@ function getRoundContextProfile(_a) {
     var abbreviatedRoundNamingMap = (roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.abbreviatedRoundNamingMap) ||
         defaultRoundNamingPolicy.abbreviatedRoundNamingMap ||
         {};
-    var preFeedAffix = ((_d = roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.affixes) === null || _d === void 0 ? void 0 : _d.preFeedRound) ||
+    var preFeedAffix = ((_f = roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.affixes) === null || _f === void 0 ? void 0 : _f.preFeedRound) ||
         defaultRoundNamingPolicy.affixes.preFeedRound;
-    var roundNumberAffix = ((_e = roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.affixes) === null || _e === void 0 ? void 0 : _e.roundNumber) ||
+    var roundNumberAffix = ((_g = roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.affixes) === null || _g === void 0 ? void 0 : _g.roundNumber) ||
         defaultRoundNamingPolicy.affixes.roundNumber;
     var namingConventions = (roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.namingConventions) ||
         defaultRoundNamingPolicy.namingConventions;
@@ -9329,14 +9335,18 @@ function getRoundContextProfile(_a) {
         })), false));
     }
     else {
+        var qualifyingFinishgMap_1 = isQualifying &&
+            ((roundNamingPolicy === null || roundNamingPolicy === void 0 ? void 0 : roundNamingPolicy.qualifyingFinishMap) ||
+                (defaultRoundNamingPolicy === null || defaultRoundNamingPolicy === void 0 ? void 0 : defaultRoundNamingPolicy.qualifyingFinishMap) ||
+                {});
         Object.assign.apply(Object, __spreadArray([roundNamingProfile], __read(roundProfileKeys.map(function (round) {
             var _a;
             if (!(roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[round]))
                 return;
             var _b = roundProfile[round], matchUpsCount = _b.matchUpsCount, preFeedRound = _b.preFeedRound;
             var participantsCount = matchUpsCount * 2;
-            var sizedRoundName = (qualifyingFinishgMap === null || qualifyingFinishgMap === void 0 ? void 0 : qualifyingFinishgMap[roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[round].finishingRound]) ||
-                (qualifyingFinishgMap && "".concat(roundNumberAffix).concat(participantsCount)) ||
+            var sizedRoundName = (qualifyingFinishgMap_1 === null || qualifyingFinishgMap_1 === void 0 ? void 0 : qualifyingFinishgMap_1[roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[round].finishingRound]) ||
+                (qualifyingFinishgMap_1 && "".concat(roundNumberAffix).concat(participantsCount)) ||
                 roundNamingMap[matchUpsCount] ||
                 "".concat(roundNumberAffix).concat(participantsCount);
             var suffix = preFeedRound ? "-".concat(preFeedAffix) : '';
@@ -9625,7 +9635,13 @@ function getAllStructureMatchUps(_a) {
             matchUps: matchUps,
         }).collectionPositionMatchUps);
     }
-    return { matchUps: matchUps, roundMatchUps: roundMatchUps, roundProfile: roundProfile, collectionPositionMatchUps: collectionPositionMatchUps };
+    return {
+        collectionPositionMatchUps: collectionPositionMatchUps,
+        roundMatchUps: roundMatchUps,
+        roundProfile: roundProfile,
+        matchUpsMap: matchUpsMap,
+        matchUps: matchUps,
+    };
     function addMatchUpContext(_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 scheduleVisibilityFilters = _a.scheduleVisibilityFilters, sourceDrawPositionRanges = _a.sourceDrawPositionRanges, drawPositionsRanges = _a.drawPositionsRanges, initialRoundOfPlay = _a.initialRoundOfPlay, additionalContext = _a.additionalContext, roundNamingProfile = _a.roundNamingProfile, tieDrawPositions = _a.tieDrawPositions, appliedPolicies = _a.appliedPolicies, isCollectionBye = _a.isCollectionBye, matchUpTieId = _a.matchUpTieId, isRoundRobin = _a.isRoundRobin, roundProfile = _a.roundProfile, sideLineUps = _a.sideLineUps, matchUp = _a.matchUp, event = _a.event;
@@ -11623,8 +11639,10 @@ function modifyMatchUpScore(_a) {
                     : undefined;
                 var matchUps = getAllStructureMatchUps({
                     afterRecoveryTimes: false,
+                    tournamentRecord: tournamentRecord,
                     inContext: true,
                     matchUpFilters: matchUpFilters,
+                    drawDefinition: drawDefinition,
                     structure: structure,
                     event: event,
                 }).matchUps;
@@ -19570,7 +19588,7 @@ function parseScoreString(_a) {
                 isSide1: winningSide === 2,
                 tiebreakTo: tiebreakTo,
             });
-        var setTiebreak = side1TiebreakPerspective || [];
+        var setTiebreak = side1TiebreakPerspective !== null && side1TiebreakPerspective !== void 0 ? side1TiebreakPerspective : [];
         var _b = __read(setScores || [], 2), side1Score = _b[0], side2Score = _b[1];
         var _c = __read(matchTiebreak || setTiebreak || [], 2), side1TiebreakScore = _c[0], side2TiebreakScore = _c[1];
         return {
@@ -19739,7 +19757,9 @@ function getSuper(values, index) {
         index ? values.slice(0, 1) : values.slice(2),
     ].map(function (n) { return parseInt(n.join('')); });
     // preserve order
-    var scores = index ? parts.reverse() : parts;
+    if (index)
+        parts.reverse();
+    var scores = parts;
     var diff = Math.abs(scores.reduce(function (a, b) { return +a - +b; }));
     if (diff >= 2)
         return scores.join('-');
@@ -20880,7 +20900,6 @@ function handleNumeric(params) {
         score = score.toString().toLowerCase();
         if (allNumeric)
             score = onlyNumbers.join('');
-        // const numbers = score.split('').map((n) => parseInt(n));
         var numbers = allNumeric
             ? onlyNumbers.map(function (n) { return parseInt(n); })
             : score.split('').map(function (n) { return parseInt(n); });
@@ -20943,12 +20962,12 @@ function handleNumeric(params) {
                 getDiff(numbers.slice(2, 4)) === 1 &&
                 getDiff(numbers.slice(5, 7)) > 1) {
                 var _k = __read(numbers, 7), s1 = _k[0], s2 = _k[1], s3 = _k[2], s4 = _k[3], tb = _k[4], s5 = _k[5], s6 = _k[6];
-                /*
-              if (tb === 1) {
-                console.log('BOO');
-                score = `${s1}-${s2} ${s3}-${s4} [${tb}${s5}-${s6}]`;
-                applied.push('numericTiebreakPattern8');
-              } else {
+                /**
+                if (tb === 1) {
+                  console.log('BOO');
+                  score = `${s1}-${s2} ${s3}-${s4} [${tb}${s5}-${s6}]`;
+                  applied.push('numericTiebreakPattern8');
+                } else {
                 */
                 score = "".concat(s1, "-").concat(s2, " ").concat(s3, "-").concat(s4, "(").concat(tb, ") ").concat(s5, "-").concat(s6);
                 applied.push('numericTiebreakPattern8');
@@ -21042,7 +21061,7 @@ function handleNumeric(params) {
             if (superParse && score !== superParse) {
                 applied.push('parsedSuperPattern');
             }
-            score = superParse || score;
+            score = superParse !== null && superParse !== void 0 ? superParse : score;
         }
     }
     return { score: score, applied: applied, matchUpStatus: matchUpStatus };
@@ -21081,6 +21100,7 @@ function sensibleSets(_a) {
     var setsCount = sets.length;
     score = sets
         .map(function (set, index) {
+        var _a;
         if (new RegExp(tiebreakSet).test(set)) {
             var tiebreak = set.slice(3);
             var setScores = set.slice(0, 3);
@@ -21089,9 +21109,9 @@ function sensibleSets(_a) {
                 var maxSetScore = Math.max.apply(Math, __spreadArray([], __read(sideScores), false));
                 var maxIndex = setScores.indexOf(maxSetScore);
                 var sensibleSetScores = [maxSetScore, maxSetScore - 1];
-                var sensibleSetScore = maxIndex
-                    ? sensibleSetScores.reverse().join('-')
-                    : sensibleSetScores.join('-');
+                if (maxIndex)
+                    sensibleSetScores.reverse();
+                var sensibleSetScore = sensibleSetScores.join('-');
                 return sensibleSetScore + tiebreak;
             }
         }
@@ -21106,7 +21126,7 @@ function sensibleSets(_a) {
         profile.push(setType);
         // check for reasonable set scores in the first two sets
         if (setsCount > 1 && setType === 'standard' && index < 2) {
-            var _a = __read(set.split('-'), 2), s1 = _a[0], s2 = _a[1];
+            var _b = __read(set.split('-'), 2), s1 = _b[0], s2 = _b[1];
             var diff = Math.abs(parseInt(s1) - parseInt(s2));
             var max = Math.max(s1, s2);
             var min_1 = Math.min(s1, s2);
@@ -21115,10 +21135,10 @@ function sensibleSets(_a) {
             // coerce larger value to something reasonable
             if (max > 9 && diff > 2) {
                 var splitMax = max.toString().split('');
-                var reasonable = splitMax.find(function (value) {
+                var reasonable = (_a = splitMax.find(function (value) {
                     return parseInt(value) > min_1 ||
                         (index && parseInt(value) <= maxSetValue);
-                }) || splitMax[0];
+                })) !== null && _a !== void 0 ? _a : splitMax[0];
                 if (reasonable) {
                     set = minIndex
                         ? [reasonable, min_1].join('-')
@@ -21130,7 +21150,7 @@ function sensibleSets(_a) {
         }
         // throw out any sets where the values are equal and there is no retirement
         if (setType === 'standard') {
-            var _b = __read(set.split('-'), 2), s1 = _b[0], s2 = _b[1];
+            var _c = __read(set.split('-'), 2), s1 = _c[0], s2 = _c[1];
             var diff = Math.abs(parseInt(s1) - parseInt(s2));
             if (!diff && matchUpStatus !== 'RETIRED') {
                 return '';
@@ -21690,7 +21710,6 @@ function getVenuesAndCourts(_a) {
         try {
             for (var _c = __values(tournamentRecord.venues || []), _d = _c.next(); !_d.done; _d = _c.next()) {
                 var venue = _d.value;
-                tournamentRecord.venues;
                 if (venueIds.length && !venueIds.includes(venue.venueId))
                     continue;
                 if (ignoreDisabled) {
@@ -23127,7 +23146,7 @@ function getContainedStructures(_a) {
         .flat()
         .filter(Boolean);
     var _loop_1 = function (structureContainer) {
-        var _c = structureContainer || {}, structures = _c.structures, structureId = _c.structureId;
+        var _c = structureContainer !== null && structureContainer !== void 0 ? structureContainer : {}, structures = _c.structures, structureId = _c.structureId;
         structures &&
             structureId &&
             (containedStructures[structureId] = structures === null || structures === void 0 ? void 0 : structures.map(function (structure) { return structure.structureId; })) &&
@@ -25317,7 +25336,7 @@ function allPlayoffPositionsFilled(params) {
                 participantIdsCount++;
             return (assignment === null || assignment === void 0 ? void 0 : assignment.bye) || (assignment === null || assignment === void 0 ? void 0 : assignment.participantId);
         }).length;
-        return structurePositionsFilled && allFilled;
+        return !!(structurePositionsFilled && allFilled);
     }, !!playoffStructures.length);
     // account for playoffStructure with only one participant
     var allParticipantIdsPlaced = participantIdsCount === enteredParticipantsCount;
@@ -30200,10 +30219,11 @@ function filterParticipants(_a) {
         var participantIds_1 = tournamentEvents
             .filter(function (event) { return eventIds.includes(event.eventId); })
             .map(function (event) {
+            var _a;
             var enteredParticipantIds = (event.entries || []).map(function (entry) { return entry.participantId; });
             if (event.eventType === SINGLES)
                 return enteredParticipantIds;
-            var individualParticipantIds = ((tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [])
+            var individualParticipantIds = ((_a = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _a !== void 0 ? _a : [])
                 .filter(function (participant) {
                 return enteredParticipantIds.includes(participant.participantId);
             })
@@ -30574,6 +30594,7 @@ var penaltyTemplate = function (_a) {
 };
 
 function addPenalty$1(_a) {
+    var _b;
     var refereeParticipantId = _a.refereeParticipantId, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, penaltyCode = _a.penaltyCode, penaltyType = _a.penaltyType, extensions = _a.extensions, penaltyId = _a.penaltyId, matchUpId = _a.matchUpId, issuedAt = _a.issuedAt, notes = _a.notes;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -30582,7 +30603,7 @@ function addPenalty$1(_a) {
     if (!penaltyType)
         return { error: MISSING_PENALTY_TYPE };
     // TODO: add penalty timeItem to matchUp.timeItems[]
-    var participants = (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [];
+    var participants = (_b = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var relevantParticipants = participants.filter(function (participant) {
         return participantIds.includes(participant.participantId);
     });
@@ -30618,18 +30639,20 @@ function addPenalty$1(_a) {
     return __assign(__assign({}, SUCCESS), { penaltyId: penaltyItem.penaltyId });
 }
 function removePenalty$1(_a) {
+    var _b;
     var tournamentRecord = _a.tournamentRecord, penaltyId = _a.penaltyId;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!penaltyId)
         return { error: MISSING_PENALTY_ID };
-    var participants = (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [];
+    var participants = (_b = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var modifiedParticipants = [];
     var penaltyRemoved = false;
     var removedPenalty;
     participants.forEach(function (participant) {
+        var _a;
         var participantModified = false;
-        participant.penalties = (participant.penalties || []).filter(function (penalty) {
+        participant.penalties = ((_a = participant.penalties) !== null && _a !== void 0 ? _a : []).filter(function (penalty) {
             if (penalty.penaltyId === penaltyId) {
                 participantModified = true;
                 if (!penaltyRemoved) {
@@ -30655,13 +30678,15 @@ function removePenalty$1(_a) {
         ? __assign(__assign({}, SUCCESS), { penalty: removedPenalty }) : { error: PENALTY_NOT_FOUND };
 }
 function getTournamentPenalties(_a) {
+    var _b;
     var tournamentRecord = _a.tournamentRecord;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
-    var participants = (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [];
+    var participants = (_b = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var allPenalties = participants.reduce(function (penalties, participant) {
+        var _a;
         var participantId = participant.participantId;
-        (participant.penalties || []).forEach(function (penalty) {
+        ((_a = participant.penalties) !== null && _a !== void 0 ? _a : []).forEach(function (penalty) {
             var penaltyId = (penalty || {}).penaltyId;
             if (penalties[penaltyId]) {
                 penalties[penaltyId].participants.push(participantId);
@@ -30675,6 +30700,7 @@ function getTournamentPenalties(_a) {
     return { penalties: Object.values(allPenalties) };
 }
 function modifyPenalty$1(_a) {
+    var _b;
     var tournamentRecord = _a.tournamentRecord, modifications = _a.modifications, penaltyId = _a.penaltyId;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -30682,7 +30708,7 @@ function modifyPenalty$1(_a) {
         return { error: INVALID_VALUES, modifications: modifications };
     if (!penaltyId)
         return { error: MISSING_PENALTY_ID };
-    var participants = (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [];
+    var participants = (_b = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var validAttributes = Object.keys(penaltyTemplate()).filter(function (attribute) { return attribute !== 'penaltyId'; });
     var validModificationAttributes = Object.keys(modifications).filter(function (attribute) { return validAttributes.includes(attribute); });
     if (!validModificationAttributes.length)
@@ -30690,8 +30716,9 @@ function modifyPenalty$1(_a) {
     var updatedPenalty;
     var modifiedParticipants = [];
     participants.forEach(function (participant) {
+        var _a;
         var participantModified = false;
-        participant.penalties = (participant.penalties || []).map(function (penalty) {
+        participant.penalties = ((_a = participant.penalties) !== null && _a !== void 0 ? _a : []).map(function (penalty) {
             if (penalty.penaltyId === penaltyId) {
                 participantModified = true;
                 validModificationAttributes.forEach(function (attribute) {
@@ -30721,18 +30748,18 @@ function modifyPenalty$1(_a) {
 
 function addPenalty(params) {
     var e_1, _a;
-    var _b;
+    var _b, _c;
     var tournamentRecords = params.tournamentRecords, participantIds = params.participantIds;
     var penaltyId;
     try {
-        for (var _c = __values(Object.values(tournamentRecords)), _d = _c.next(); !_d.done; _d = _c.next()) {
-            var tournamentRecord = _d.value;
+        for (var _d = __values(Object.values(tournamentRecords)), _e = _d.next(); !_e.done; _e = _d.next()) {
+            var tournamentRecord = _e.value;
             var participants = (_b = getParticipants$1({
                 tournamentRecord: tournamentRecord,
             }).participants) !== null && _b !== void 0 ? _b : [];
             var tournamentParticipantIds = participants === null || participants === void 0 ? void 0 : participants.map(extractAttributes('participantId')).filter(function (participantId) { return participantIds.includes(participantId); });
             if (tournamentParticipantIds.length) {
-                var result = addPenalty$1(__assign(__assign({}, params), { penaltyId: params.penaltyId || penaltyId, tournamentRecord: tournamentRecord, participantIds: tournamentParticipantIds }));
+                var result = addPenalty$1(__assign(__assign({}, params), { penaltyId: (_c = params.penaltyId) !== null && _c !== void 0 ? _c : penaltyId, tournamentRecord: tournamentRecord, participantIds: tournamentParticipantIds }));
                 penaltyId = result.penaltyId;
             }
         }
@@ -30740,7 +30767,7 @@ function addPenalty(params) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
         }
         finally { if (e_1) throw e_1.error; }
     }
@@ -30804,7 +30831,7 @@ function getCompetitionPenalties(_a) {
         for (var _c = __values(Object.values(tournamentRecords)), _d = _c.next(); !_d.done; _d = _c.next()) {
             var tournamentRecord = _d.value;
             var penalties = getTournamentPenalties({ tournamentRecord: tournamentRecord }).penalties;
-            allPenalties.push.apply(allPenalties, __spreadArray([], __read((penalties || [])), false));
+            allPenalties.push.apply(allPenalties, __spreadArray([], __read((penalties !== null && penalties !== void 0 ? penalties : [])), false));
         }
     }
     catch (e_4_1) { e_4 = { error: e_4_1 }; }
@@ -36652,7 +36679,8 @@ function modifyPersonRequests(_a) {
 
 function clearScheduledMatchUps$1(_a) {
     var e_1, _b;
-    var _c = _a.scheduleAttributes, scheduleAttributes = _c === void 0 ? ['scheduledDate', 'scheduledTime'] : _c, _d = _a.ignoreMatchUpStatuses, ignoreMatchUpStatuses = _d === void 0 ? completedMatchUpStatuses : _d, tournamentRecord = _a.tournamentRecord, scheduledDates = _a.scheduledDates, _e = _a.venueIds, venueIds = _e === void 0 ? [] : _e;
+    var _c, _d, _e;
+    var _f = _a.scheduleAttributes, scheduleAttributes = _f === void 0 ? ['scheduledDate', 'scheduledTime'] : _f, _g = _a.ignoreMatchUpStatuses, ignoreMatchUpStatuses = _g === void 0 ? completedMatchUpStatuses : _g, tournamentRecord = _a.tournamentRecord, scheduledDates = _a.scheduledDates, _h = _a.venueIds, venueIds = _h === void 0 ? [] : _h;
     if (typeof tournamentRecord !== 'object')
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!Array.isArray(ignoreMatchUpStatuses) || !Array.isArray(venueIds)) {
@@ -36660,10 +36688,10 @@ function clearScheduledMatchUps$1(_a) {
     }
     if (venueIds.length)
         scheduleAttributes.push('venueId');
-    var inContextMatchUps = allTournamentMatchUps({
+    var inContextMatchUps = (_c = allTournamentMatchUps({
         matchUpFilters: { scheduledDates: scheduledDates },
         tournamentRecord: tournamentRecord,
-    }).matchUps || [];
+    }).matchUps) !== null && _c !== void 0 ? _c : [];
     var relevantMatchUpIds = inContextMatchUps
         .filter(function (matchUp) {
         return matchUp.matchUpStatus &&
@@ -36672,16 +36700,16 @@ function clearScheduledMatchUps$1(_a) {
             (!(venueIds === null || venueIds === void 0 ? void 0 : venueIds.length) || venueIds.includes(matchUp.schedule.venueId));
     })
         .map(getMatchUpId);
-    var matchUps = allTournamentMatchUps({
+    var matchUps = (_d = allTournamentMatchUps({
         tournamentRecord: tournamentRecord,
         inContext: false,
-    }).matchUps || [];
+    }).matchUps) !== null && _d !== void 0 ? _d : [];
     var clearedScheduleCount = 0;
     try {
         for (var matchUps_1 = __values(matchUps), matchUps_1_1 = matchUps_1.next(); !matchUps_1_1.done; matchUps_1_1 = matchUps_1.next()) {
             var matchUp = matchUps_1_1.value;
             if (relevantMatchUpIds.includes(matchUp.matchUpId)) {
-                matchUp.timeItems = (matchUp.timeItems || []).filter(function (timeItem) {
+                matchUp.timeItems = ((_e = matchUp.timeItems) !== null && _e !== void 0 ? _e : []).filter(function (timeItem) {
                     return (timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemType) &&
                         ![
                             ALLOCATE_COURTS,
@@ -39721,18 +39749,19 @@ function getEventAlternateParticipantIds(_a) {
 }
 
 function matchUpActions$1(_a) {
+    var _b, _c;
     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) {
         // if matchUp did not have context, find drawId by brute force
-        var matchUps = allTournamentMatchUps({ tournamentRecord: tournamentRecord }).matchUps || [];
+        var matchUps = (_b = allTournamentMatchUps({ tournamentRecord: tournamentRecord }).matchUps) !== null && _b !== void 0 ? _b : [];
         drawId = matchUps.reduce(function (drawId, candidate) {
             return candidate.matchUpId === matchUpId ? candidate.drawId : drawId;
         }, undefined);
-        var events = tournamentRecord.events || [];
+        var events = (_c = tournamentRecord.events) !== null && _c !== void 0 ? _c : [];
         var drawDefinitions = events
-            .map(function (event) { return event.drawDefinitions || []; })
+            .map(function (event) { var _a; return (_a = event.drawDefinitions) !== null && _a !== void 0 ? _a : []; })
             .flat();
         drawDefinition = drawDefinitions.reduce(function (drawDefinition, candidate) {
             return candidate.drawId === drawId ? candidate : drawDefinition;
@@ -39744,7 +39773,7 @@ function matchUpActions$1(_a) {
         drawDefinition: drawDefinition,
         event: event,
     }).policyDefinitions;
-    policyDefinitions = policyDefinitions || attachedPolicy;
+    policyDefinitions = policyDefinitions !== null && policyDefinitions !== void 0 ? policyDefinitions : attachedPolicy;
     if (drawDefinition) {
         return matchUpActions$2({
             tournamentParticipants: tournamentRecord.participants,
@@ -40231,16 +40260,17 @@ function deletionMessage(_a) {
 
 function deleteVenue$1(_a) {
     var e_1, _b;
+    var _c, _d;
     var tournamentRecord = _a.tournamentRecord, venueId = _a.venueId, force = _a.force;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (typeof venueId !== 'string')
         return { error: MISSING_VENUE_ID };
     var contextFilters = { venueIds: [venueId] };
-    var matchUpsToUnschedule = allTournamentMatchUps({
+    var matchUpsToUnschedule = (_c = allTournamentMatchUps({
         tournamentRecord: tournamentRecord,
         contextFilters: contextFilters,
-    }).matchUps || [];
+    }).matchUps) !== null && _c !== void 0 ? _c : [];
     if (!matchUpsToUnschedule.length || force) {
         try {
             // if no matchUpsToUnschedule this does nothing but avoid the deletionMessage
@@ -40267,7 +40297,7 @@ function deleteVenue$1(_a) {
         return deletionMessage({ matchUpsCount: matchUpsToUnschedule.length });
     }
     var deleted;
-    tournamentRecord.venues = (tournamentRecord.venues || []).filter(function (venue) {
+    tournamentRecord.venues = ((_d = tournamentRecord.venues) !== null && _d !== void 0 ? _d : []).filter(function (venue) {
         if ((venue === null || venue === void 0 ? void 0 : venue.venueId) !== venueId)
             return true;
         deleted = true;
@@ -40487,6 +40517,7 @@ function getScheduledVenueMatchUps(_a) {
 
 function deleteCourt$1(_a) {
     var e_1, _b;
+    var _c;
     var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, disableNotice = _a.disableNotice, courtId = _a.courtId, force = _a.force;
     var result = findCourt({ tournamentRecord: tournamentRecord, courtId: courtId });
     if (result.error)
@@ -40498,8 +40529,8 @@ function deleteCourt$1(_a) {
     }).matchUps;
     if (!(matchUps === null || matchUps === void 0 ? void 0 : matchUps.length) || force) {
         try {
-            for (var _c = __values(matchUps || []), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var matchUp = _d.value;
+            for (var _d = __values(matchUps !== null && matchUps !== void 0 ? matchUps : []), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var matchUp = _e.value;
                 var result_1 = removeCourtAssignment({
                     matchUpId: matchUp.matchUpId,
                     drawId: matchUp.drawId,
@@ -40513,12 +40544,12 @@ function deleteCourt$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
             }
             finally { if (e_1) throw e_1.error; }
         }
         if (venue) {
-            venue.courts = (venue.courts || []).filter(function (courtRecord) {
+            venue.courts = ((_c = venue.courts) !== null && _c !== void 0 ? _c : []).filter(function (courtRecord) {
                 return courtRecord.courtId !== courtId;
             });
             if (!disableNotice)
@@ -41930,7 +41961,7 @@ function treeMatchUps(_a) {
         uuids: uuids,
     }), roundNodes = _b.roundNodes, matchUps = _b.matchUps);
     roundNumber++;
-    roundLimit = roundLimit || qualifyingRoundNumber;
+    roundLimit = roundLimit !== null && roundLimit !== void 0 ? roundLimit : qualifyingRoundNumber;
     while (roundNodes.length > 1) {
         if (qualifyingPositions && roundNodes.length === qualifyingPositions) {
             roundLimit = roundNumber - 1;
@@ -41960,7 +41991,7 @@ function treeMatchUps(_a) {
         roundLimit = roundNumber - 1;
     }
     else {
-        matchUps = matchUps.filter(function (matchUp) { return roundLimit && (matchUp.roundNumber || 0) <= roundLimit; });
+        matchUps = matchUps.filter(function (matchUp) { var _a; return roundLimit && ((_a = matchUp.roundNumber) !== null && _a !== void 0 ? _a : 0) <= roundLimit; });
     }
     return { drawSize: drawSize, matchUps: matchUps, roundsCount: roundsCount, roundLimit: roundLimit };
 }
@@ -42101,7 +42132,6 @@ function generateQualifyingStructures(_a) {
                 roundTarget: roundTarget,
                 linkType: linkType,
             });
-            targetRoundQualifiersCount = 0;
             roundTarget += 1;
         }
     }
@@ -42116,16 +42146,19 @@ function generateQualifyingStructures(_a) {
 }
 
 function getStructureRoundProfile(_a) {
-    var drawDefinition = _a.drawDefinition, structureId = _a.structureId;
+    var drawDefinition = _a.drawDefinition, matchUpsMap = _a.matchUpsMap, structureId = _a.structureId;
     var result = findStructure({
         drawDefinition: drawDefinition,
         structureId: structureId,
     });
     if (result.error)
-        return result;
+        return decorateResult({ result: result });
     // DEV-NOTE cannot pass drawDefinition parameter in this scenario; callstack error
-    var matchUps = getAllStructureMatchUps({ structure: result.structure }).matchUps;
-    return getRoundMatchUps$1({ matchUps: matchUps });
+    var matchUps = getAllStructureMatchUps({
+        structure: result.structure,
+        matchUpsMap: matchUpsMap,
+    }).matchUps;
+    return __assign(__assign({}, getRoundMatchUps$1({ matchUps: matchUps })), { matchUps: matchUps, matchUpsMap: matchUpsMap });
 }
 
 function getFinishingPositionSourceRoundsMap(_a) {
@@ -42172,23 +42205,24 @@ function roundValueRanges(values) {
 }
 
 function getPositionsPlayedOff(_a) {
-    var drawDefinition = _a.drawDefinition, structureIds = _a.structureIds;
+    var _b;
+    var drawDefinition = _a.drawDefinition, structureIds = _a.structureIds, matchUpsMap = _a.matchUpsMap;
     if (structureIds && !Array.isArray(structureIds))
         return { error: INVALID_VALUES, context: { structureIds: structureIds } };
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     structureIds =
-        structureIds ||
-            (drawDefinition.structures || [])
-                .filter(function (structure) { return structure.stage !== QUALIFYING; })
-                .map(function (_a) {
-                var structureId = _a.structureId;
-                return structureId;
-            });
+        structureIds !== null && structureIds !== void 0 ? structureIds : ((_b = drawDefinition.structures) !== null && _b !== void 0 ? _b : [])
+            .filter(function (structure) { return structure.stage !== QUALIFYING; })
+            .map(function (_a) {
+            var structureId = _a.structureId;
+            return structureId;
+        });
     var allFinishingPositionRanges = structureIds
         .map(function (structureId) {
         var roundProfile = getStructureRoundProfile({
             drawDefinition: drawDefinition,
+            matchUpsMap: matchUpsMap,
             structureId: structureId,
         }).roundProfile;
         var values = roundProfile && Object.values(roundProfile);
@@ -42304,20 +42338,21 @@ function getAvailablePlayoffProfiles$1(_a) {
     var drawDefinition = _a.drawDefinition, structureId = _a.structureId;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
+    var _c = allDrawMatchUps$1({
+        inContext: true,
+        drawDefinition: drawDefinition,
+    }), matchUps = _c.matchUps, matchUpsMap = _c.matchUpsMap;
     // positions which are being played off by existing structure(s)
-    var _c = getPositionsPlayedOff({
+    var _d = getPositionsPlayedOff({
         drawDefinition: drawDefinition,
-    }), positionsNotPlayedOff = _c.positionsNotPlayedOff, positionsPlayedOff = _c.positionsPlayedOff;
+        matchUpsMap: matchUpsMap,
+    }), positionsNotPlayedOff = _d.positionsNotPlayedOff, positionsPlayedOff = _d.positionsPlayedOff;
     var structures = getDrawStructures({ drawDefinition: drawDefinition }).structures;
     var filteredStructures = structures.filter(function (structure) {
         return (!structureId && structure.stage !== VOLUNTARY_CONSOLATION) ||
             structure.structureId === structureId;
     });
     var available = {};
-    var matchUps = allDrawMatchUps$1({
-        inContext: true,
-        drawDefinition: drawDefinition,
-    }).matchUps;
     try {
         for (var filteredStructures_1 = __values(filteredStructures), filteredStructures_1_1 = filteredStructures_1.next(); !filteredStructures_1_1.done; filteredStructures_1_1 = filteredStructures_1.next()) {
             var structure = filteredStructures_1_1.value;
@@ -46876,16 +46911,203 @@ function generateVoluntaryConsolation$1(params) {
     return __assign({ links: links, structures: structures }, SUCCESS);
 }
 
+/**
+ * return an array of arrays of grouped structureIds => structureGroups
+ * the expectation is that all structures within a drawDefintion are linked
+ * return a boolean whether this condition is met => allSructuresLinked
+ */
+function getStructureGroups(_a) {
+    var e_1, _b, e_2, _c, e_3, _d;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var drawDefinition = _a.drawDefinition;
+    var structures = drawDefinition.structures || [];
+    var links = drawDefinition.links || [];
+    var structureProfiles = new Map();
+    var initStructureProfile = function (structureId) {
+        var profile = structureProfiles.get(structureId) ||
+            (structureProfiles.set(structureId, {
+                drawSources: [],
+                drawTargets: [],
+                progeny: [],
+                sources: [],
+                targets: [],
+            }) &&
+                structureProfiles.get(structureId));
+        if (profile && !(profile === null || profile === void 0 ? void 0 : profile.stage)) {
+            var structure = structures.find(function (structure) { return structure.structureId === structureId; });
+            profile.stage = structure === null || structure === void 0 ? void 0 : structure.stage;
+        }
+        return profile;
+    };
+    var sourceStructureIds = {};
+    var hasDrawFeedProfile = {};
+    var linkedStructureIds = links.map(function (link) {
+        var sourceId = link.source.structureId;
+        var targetId = link.target.structureId;
+        var sourceProfile = initStructureProfile(sourceId);
+        var targetProfile = initStructureProfile(targetId);
+        if ([BOTTOM_UP, TOP_DOWN, RANDOM, WATERFALL].includes(link.target.feedProfile)) {
+            sourceProfile === null || sourceProfile === void 0 ? void 0 : sourceProfile.targets.push(targetId);
+            targetProfile === null || targetProfile === void 0 ? void 0 : targetProfile.sources.push(sourceId);
+        }
+        else if (link.target.feedProfile === DRAW) {
+            targetProfile === null || targetProfile === void 0 ? void 0 : targetProfile.drawSources.push(sourceId);
+            sourceProfile === null || sourceProfile === void 0 ? void 0 : sourceProfile.drawTargets.push(targetId);
+        }
+        hasDrawFeedProfile[targetId] =
+            hasDrawFeedProfile[targetId] || link.target.feedProfile === DRAW;
+        sourceStructureIds[targetId] = unique(__spreadArray(__spreadArray([], __read((sourceStructureIds[targetId] || [])), false), [
+            sourceId,
+        ], false)).filter(Boolean);
+        return [link.source.structureId, link.target.structureId];
+    });
+    try {
+        for (var _p = __values(structureProfiles.keys()), _q = _p.next(); !_q.done; _q = _p.next()) {
+            var structureId = _q.value;
+            var profile = structureProfiles.get(structureId);
+            if (profile) {
+                var sourceIds = (_e = profile.targets) !== null && _e !== void 0 ? _e : [];
+                while (sourceIds.length) {
+                    var sourceId = sourceIds.pop();
+                    var sourceProfile = sourceId && structureProfiles[sourceId];
+                    if ((_f = sourceProfile === null || sourceProfile === void 0 ? void 0 : sourceProfile.targets) === null || _f === void 0 ? void 0 : _f.length) {
+                        sourceIds.push.apply(sourceIds, __spreadArray([], __read(sourceProfile.targets), false));
+                    }
+                    else if (sourceProfile) {
+                        profile.rootStage = sourceProfile.stage;
+                    }
+                }
+                if (!profile.rootStage)
+                    profile.rootStage = profile.stage;
+                if (!((_g = profile.targets) === null || _g === void 0 ? void 0 : _g.length)) {
+                    var targetIds = (_h = profile.sources) !== null && _h !== void 0 ? _h : [];
+                    while (targetIds.length) {
+                        var targetId = targetIds.pop();
+                        var targetProfile = targetId && structureProfiles[targetId];
+                        if ((_j = targetProfile === null || targetProfile === void 0 ? void 0 : targetProfile.sources) === null || _j === void 0 ? void 0 : _j.length) {
+                            try {
+                                for (var _r = (e_2 = void 0, __values(targetProfile.sources)), _s = _r.next(); !_s.done; _s = _r.next()) {
+                                    var id = _s.value;
+                                    if (!((_k = profile.progeny) === null || _k === void 0 ? void 0 : _k.includes(id)))
+                                        (_l = profile.progeny) === null || _l === void 0 ? void 0 : _l.push(id);
+                                }
+                            }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            finally {
+                                try {
+                                    if (_s && !_s.done && (_c = _r.return)) _c.call(_r);
+                                }
+                                finally { if (e_2) throw e_2.error; }
+                            }
+                            targetIds.push.apply(targetIds, __spreadArray([], __read(targetProfile.sources), false));
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_q && !_q.done && (_b = _p.return)) _b.call(_p);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    var maxQualifyingDepth = 0;
+    try {
+        for (var _t = __values(structureProfiles.keys()), _u = _t.next(); !_u.done; _u = _t.next()) {
+            var structureId = _u.value;
+            var profile = structureProfiles.get(structureId);
+            if (profile && profile.rootStage === QUALIFYING) {
+                var drawTargets = [(_m = profile.drawTargets) === null || _m === void 0 ? void 0 : _m[0]];
+                var distanceFromMain = 0;
+                while (drawTargets.length) {
+                    distanceFromMain += 1;
+                    var drawTarget = drawTargets.pop();
+                    var targetProfile = drawTarget
+                        ? structureProfiles.get(drawTarget)
+                        : undefined;
+                    if ((_o = targetProfile === null || targetProfile === void 0 ? void 0 : targetProfile.drawTargets) === null || _o === void 0 ? void 0 : _o.length) {
+                        drawTargets.push(targetProfile.drawTargets[0]);
+                    }
+                }
+                profile.distanceFromMain = distanceFromMain;
+                if (distanceFromMain > maxQualifyingDepth)
+                    maxQualifyingDepth = distanceFromMain;
+            }
+        }
+    }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    finally {
+        try {
+            if (_u && !_u.done && (_d = _t.return)) _d.call(_t);
+        }
+        finally { if (e_3) throw e_3.error; }
+    }
+    // iterate through all groups of structureIds to flatten tree of links between structures
+    var iterations = linkedStructureIds.length;
+    generateRange(0, Math.ceil(iterations / 2)).forEach(function () {
+        linkedStructureIds = generateRange(0, iterations).map(function (index) {
+            var structureIds = linkedStructureIds[index];
+            var mergedWithOverlappingIds = linkedStructureIds.reduce(function (biggest, ids) {
+                var hasOverlap = overlap(structureIds, ids);
+                return hasOverlap ? biggest.concat.apply(biggest, __spreadArray([], __read(ids), false)) : biggest;
+            }, []) || [];
+            return unique(structureIds.concat.apply(structureIds, __spreadArray([], __read(mergedWithOverlappingIds), false)));
+        });
+    });
+    // at this point all linkedStructureIds arrays should be equivalent
+    // use the first of these as the identity array
+    var groupedStructureIds = linkedStructureIds[0];
+    // utility method to recognize equivalent arrays of structureIds
+    var identityLink = function (a, b) { return intersection(a, b).length === a.length; };
+    // check that all arrays of linkedStructureIds are equivalent to identity array
+    var allLinkStructuresLinked = linkedStructureIds
+        .slice(1)
+        .reduce(function (allLinkStructuresLinked, ids) {
+        return allLinkStructuresLinked && identityLink(ids, groupedStructureIds);
+    }, true);
+    // if a drawDefinition contains no links then no structure groups will exist
+    // filter out undefined when there are no links in a drawDefinition
+    var structureGroups = [groupedStructureIds].filter(Boolean);
+    // this is the same as structureGroups, but excludes VOLUNTARY_CONSOLATION
+    var linkCheck = [groupedStructureIds].filter(Boolean);
+    // iterate through all structures to add missing structureIds
+    structures.forEach(function (structure) {
+        var structureId = structure.structureId, stage = structure.stage;
+        var existingGroup = structureGroups.find(function (group) {
+            return group.includes(structureId);
+        });
+        if (!existingGroup) {
+            structureGroups.push([structureId]);
+            if (stage !== VOLUNTARY_CONSOLATION)
+                linkCheck.push([structureId]);
+        }
+    });
+    var allStructuresLinked = allLinkStructuresLinked && linkCheck.length === 1;
+    if (!(links === null || links === void 0 ? void 0 : links.length) && structures.length === 1) {
+        initStructureProfile(structures[0].structureId);
+    }
+    return {
+        structureProfiles: Object.fromEntries(structureProfiles),
+        allStructuresLinked: allStructuresLinked,
+        maxQualifyingDepth: maxQualifyingDepth,
+        sourceStructureIds: sourceStructureIds,
+        hasDrawFeedProfile: hasDrawFeedProfile,
+        structureGroups: structureGroups,
+    };
+}
+
 // for use when adding a qualifying structure to an existing drawDefinition
 // not for use when generating structures from qualifyingProfiles
 function generateQualifyingStructure$1(params) {
     var _a;
-    var _b, _c, _d, _e;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
     if (!params.drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     var stack = 'generateQualifyingStructure';
-    var drawSize = params.drawSize || coerceEven(params.participantsCount);
-    var qualifyingRoundNumber = params.qualifyingRoundNumber, qualifyingPositions = params.qualifyingPositions, targetStructureId = params.targetStructureId, structureOptions = params.structureOptions, appliedPolicies = params.appliedPolicies, drawDefinition = params.drawDefinition, structureName = params.structureName, structureId = params.structureId, roundTarget = params.roundTarget, drawType = params.drawType, idPrefix = params.idPrefix, isMock = params.isMock, uuids = params.uuids;
+    var drawSize = (_b = params.drawSize) !== null && _b !== void 0 ? _b : coerceEven(params.participantsCount);
+    var qualifyingRoundNumber = params.qualifyingRoundNumber, qualifyingPositions = params.qualifyingPositions, targetStructureId = params.targetStructureId, structureOptions = params.structureOptions, appliedPolicies = params.appliedPolicies, drawDefinition = params.drawDefinition, matchUpFormat = params.matchUpFormat, structureName = params.structureName, structureId = params.structureId, roundTarget = params.roundTarget, drawType = params.drawType, idPrefix = params.idPrefix, isMock = params.isMock, uuids = params.uuids;
     var roundLimit, roundsCount, structure, matchUps;
     var qualifiersCount = 0;
     var finishingPositions;
@@ -46893,68 +47115,27 @@ function generateQualifyingStructure$1(params) {
     if (!isConvertableInteger(drawSize)) {
         return decorateResult({ result: { error: MISSING_DRAW_SIZE }, stack: stack });
     }
-    var result = findStructure({
-        structureId: targetStructureId,
-        drawDefinition: drawDefinition,
-    });
-    if (result.error) {
+    var structureProfiles = getStructureGroups({ drawDefinition: drawDefinition }).structureProfiles;
+    var structureProfile = structureProfiles[targetStructureId];
+    if (!structureProfile) {
         return decorateResult({
+            result: { error: STRUCTURE_NOT_FOUND },
             context: { targetStructureId: targetStructureId },
-            result: result,
             stack: stack,
         });
     }
-    if (!result.structure)
-        return { error: STRUCTURE_NOT_FOUND };
-    var targetStructure = result.structure;
-    var matchUpType = targetStructure.matchUpType;
-    if (targetStructure.stage === QUALIFYING) {
-        if (targetStructure.stageSequence && targetStructure.stageSequence > 1) {
-            stageSequence = targetStructure.stageSequence - 1;
-        }
-        else {
-            // stageSequence must be modified for entire qualifying chain
-            var nextStructureId_1 = targetStructureId;
-            var nextStageSequence = 2;
-            var chainModified = void 0;
-            while (!chainModified && nextStructureId_1) {
-                targetStructure.stageSequence = nextStageSequence;
-                var targetTargetStructureId = (_d = (_c = (_b = drawDefinition.links) === null || _b === void 0 ? void 0 : _b.find(function (link) { return link.source.structureId === nextStructureId_1; })) === null || _c === void 0 ? void 0 : _c.target) === null || _d === void 0 ? void 0 : _d.structureId;
-                nextStructureId_1 = targetTargetStructureId;
-                nextStageSequence += 1;
-                if (!targetTargetStructureId) {
-                    chainModified = true;
-                }
-                else {
-                    var result_1 = findStructure({
-                        structureId: targetTargetStructureId,
-                        drawDefinition: drawDefinition,
-                    });
-                    if (!result_1.structure)
-                        return { error: STRUCTURE_NOT_FOUND };
-                    if (result_1.error) {
-                        return decorateResult({
-                            context: { targetTargetStructureId: targetTargetStructureId },
-                            result: result_1,
-                            stack: stack,
-                        });
-                    }
-                    if (result_1.structure.stage !== QUALIFYING)
-                        chainModified = true;
-                }
-            }
-        }
-    }
+    var matchUpType = drawDefinition.matchUpType;
     var roundTargetName = roundTarget ? "".concat(roundTarget, "-") : '';
-    var stageSequenceName = "".concat(stageSequence);
-    var qualifyingStructureName = structureName ||
-        (roundTargetName || stageSequenceName
-            ? "".concat(constantToString(QUALIFYING), " ").concat(roundTargetName).concat(stageSequenceName)
-            : constantToString(QUALIFYING));
+    var isPreQualifying = structureProfile.stage === QUALIFYING;
+    var preQualifyingNaming = (_e = (_d = (_c = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_ROUND_NAMING]) === null || _c === void 0 ? void 0 : _c.namingConventions) === null || _d === void 0 ? void 0 : _d.pre) !== null && _e !== void 0 ? _e : (_g = (_f = POLICY_ROUND_NAMING_DEFAULT[POLICY_TYPE_ROUND_NAMING]) === null || _f === void 0 ? void 0 : _f.namingConventions) === null || _g === void 0 ? void 0 : _g.pre;
+    var pre = isPreQualifying && preQualifyingNaming ? "".concat(preQualifyingNaming, "-") : '';
+    var qualifyingStructureName = structureName !== null && structureName !== void 0 ? structureName : (roundTargetName
+        ? "".concat(pre).concat(constantToString(QUALIFYING), " ").concat(roundTargetName)
+        : "".concat(pre).concat(constantToString(QUALIFYING)));
     if (drawType === ROUND_ROBIN) {
-        var _f = generateRoundRobin({
-            structureName: structureName || qualifyingStructureName,
-            structureId: structureId || (uuids === null || uuids === void 0 ? void 0 : uuids.pop()),
+        var _k = generateRoundRobin({
+            structureName: structureName !== null && structureName !== void 0 ? structureName : qualifyingStructureName,
+            structureId: structureId !== null && structureId !== void 0 ? structureId : uuids === null || uuids === void 0 ? void 0 : uuids.pop(),
             stage: QUALIFYING,
             structureOptions: structureOptions,
             appliedPolicies: appliedPolicies,
@@ -46965,7 +47146,7 @@ function generateQualifyingStructure$1(params) {
             drawSize: drawSize,
             isMock: isMock,
             uuids: uuids,
-        }), maxRoundNumber = _f.maxRoundNumber /*, groupSize*/, structures = _f.structures, groupCount = _f.groupCount;
+        }), maxRoundNumber = _k.maxRoundNumber /*, groupSize*/, structures = _k.structures, groupCount = _k.groupCount;
         qualifiersCount = groupCount;
         roundLimit = maxRoundNumber;
         structure = structures[0];
@@ -46984,10 +47165,11 @@ function generateQualifyingStructure$1(params) {
         if (!roundLimit)
             roundLimit = roundsCount;
         structure = structureTemplate({
-            structureName: structureName || qualifyingStructureName,
-            structureId: structureId || (uuids === null || uuids === void 0 ? void 0 : uuids.pop()),
+            structureName: structureName !== null && structureName !== void 0 ? structureName : qualifyingStructureName,
+            structureId: structureId !== null && structureId !== void 0 ? structureId : uuids === null || uuids === void 0 ? void 0 : uuids.pop(),
             qualifyingRoundNumber: roundLimit,
             stage: QUALIFYING,
+            matchUpFormat: matchUpFormat,
             stageSequence: stageSequence,
             matchUpType: matchUpType,
             roundLimit: roundLimit,
@@ -46999,22 +47181,25 @@ function generateQualifyingStructure$1(params) {
                 extension: { name: ROUND_TARGET, value: roundTarget },
             });
         }
-        qualifiersCount = (_e = matchUps === null || matchUps === void 0 ? void 0 : matchUps.filter(function (matchUp) { return matchUp.roundNumber === roundLimit; })) === null || _e === void 0 ? void 0 : _e.length;
+        qualifiersCount = (_h = matchUps === null || matchUps === void 0 ? void 0 : matchUps.filter(function (matchUp) { return matchUp.roundNumber === roundLimit; })) === null || _h === void 0 ? void 0 : _h.length;
     }
     // order of operations is important here!! finalQualifier positions is not yet updated when this step occurs
     var linkType = drawType === ROUND_ROBIN ? LinkTypeEnum.Position : LinkTypeEnum.Winner;
-    var link = generateQualifyingLink({
-        sourceStructureId: structure.structureId,
-        sourceRoundNumber: roundLimit,
-        targetStructureId: targetStructureId,
-        finishingPositions: finishingPositions,
-        linkType: linkType,
-    }).link;
+    var link = structure &&
+        roundLimit &&
+        ((_j = generateQualifyingLink({
+            sourceStructureId: structure.structureId,
+            sourceRoundNumber: roundLimit,
+            targetStructureId: targetStructureId,
+            finishingPositions: finishingPositions,
+            linkType: linkType,
+        })) === null || _j === void 0 ? void 0 : _j.link);
     return __assign(__assign({ qualifyingDrawPositionsCount: drawSize, qualifiersCount: qualifiersCount }, SUCCESS), { structure: structure, link: link });
 }
 
 function attachQualifyingStructure$1(_a) {
-    var _b;
+    var e_1, _b;
+    var _c;
     var drawDefinition = _a.drawDefinition, tournamentId = _a.tournamentId, structure = _a.structure, eventId = _a.eventId, link = _a.link;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
@@ -47039,7 +47224,27 @@ function attachQualifyingStructure$1(_a) {
         drawDefinition.links = [];
     drawDefinition.structures.push(structure);
     drawDefinition.links.push(link);
-    var matchUps = ((_b = getAllStructureMatchUps({ structure: structure })) === null || _b === void 0 ? void 0 : _b.matchUps) || [];
+    var _d = getStructureGroups({
+        drawDefinition: drawDefinition,
+    }), maxQualifyingDepth = _d.maxQualifyingDepth, structureProfiles = _d.structureProfiles;
+    try {
+        for (var _e = __values(drawDefinition.structures), _f = _e.next(); !_f.done; _f = _e.next()) {
+            var structure_1 = _f.value;
+            var profile = structureProfiles[structure_1.structureId];
+            if (profile.distanceFromMain) {
+                structure_1.stageSequence =
+                    maxQualifyingDepth + 1 - profile.distanceFromMain;
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    var matchUps = ((_c = getAllStructureMatchUps({ structure: structure })) === null || _c === void 0 ? void 0 : _c.matchUps) || [];
     addMatchUpsNotice({
         drawDefinition: drawDefinition,
         tournamentId: tournamentId,
@@ -47252,6 +47457,10 @@ function getAdvancingParticipantId(matchUp) {
 
 function addQualifyingStructure$1(params) {
     var _a, _b;
+    if (!params.drawDefinition)
+        return { error: MISSING_DRAW_DEFINITION };
+    if (!params.targetStructureId)
+        return { error: MISSING_STRUCTURE_ID };
     var result = generateQualifyingStructure$1(params);
     if (result.error)
         return result;
@@ -47581,7 +47790,7 @@ function renameStructures$1(_a) {
 }
 
 function removeStructure(_a) {
-    var _b, _c;
+    var _b, _c, _d;
     var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, event = _a.event;
     if (typeof structureId !== 'string')
         return { error: INVALID_VALUES };
@@ -47596,13 +47805,16 @@ function removeStructure(_a) {
         return stage === MAIN && stageSequence === 1;
     });
     var isMainStageSequence1 = structureId === mainStageSequence1.structureId;
-    var hasQualifying = structures.find(function (_a) {
+    var qualifyingStructureIds = structures
+        .filter(function (_a) {
         var stage = _a.stage;
         return stage === QUALIFYING;
-    });
-    if (isMainStageSequence1 && !hasQualifying) {
+    })
+        .map(extractAttributes('structureId'));
+    if (isMainStageSequence1 && !qualifyingStructureIds.length) {
         return { error: CANNOT_REMOVE_MAIN_STRUCTURE };
     }
+    var structureIds = structures.map(extractAttributes('structureId'));
     var removedMatchUpIds = [];
     var idsToRemove = [structureId];
     var getTargetedStructureIds = function (structureId) {
@@ -47613,16 +47825,21 @@ function removeStructure(_a) {
                 link.target.structureId;
         }).filter(Boolean);
     };
-    var structureIds = structures.map(function (_a) {
-        var structureId = _a.structureId;
-        return structureId;
-    });
-    var targetedStructureIdsMap = Object.assign.apply(Object, __spreadArray([{}], __read(structureIds.map(function (structureId) {
+    var getQualifyingSourceStructureIds = function (structureId) {
         var _a;
-        return (_a = {},
-            _a[structureId] = getTargetedStructureIds(structureId),
-            _a);
-    })), false));
+        return (_a = drawDefinition.links) === null || _a === void 0 ? void 0 : _a.map(function (link) {
+            return qualifyingStructureIds.includes(link.source.structureId) &&
+                link.target.structureId === structureId &&
+                link.source.structureId;
+        }).filter(Boolean);
+    };
+    var isQualifyingStructure = qualifyingStructureIds.includes(structureId);
+    var relatedStructureIdsMap = new Map();
+    structureIds.forEach(function (id) {
+        return relatedStructureIdsMap.set(id, isQualifyingStructure
+            ? getQualifyingSourceStructureIds(id)
+            : getTargetedStructureIds(id));
+    });
     var _loop_1 = function () {
         var idBeingRemoved = idsToRemove.pop();
         var structure = findStructure({
@@ -47645,11 +47862,13 @@ function removeStructure(_a) {
             });
         }
         var targetedStructureIds = idBeingRemoved &&
-            targetedStructureIdsMap[idBeingRemoved].filter(function (id) {
+            (
+            // targetedStructureIdsMap[idBeingRemoved].filter(
+            (_d = relatedStructureIdsMap.get(idBeingRemoved)) === null || _d === void 0 ? void 0 : _d.filter(function (id) {
                 // IMPORTANT: only delete MAIN stageSequence: 1 if specified to protect against DOUBLE_ELIMINATION scenario
                 return id !== mainStageSequence1.structureId ||
                     structureId === mainStageSequence1.structureId;
-            });
+            }));
         if (targetedStructureIds === null || targetedStructureIds === void 0 ? void 0 : targetedStructureIds.length)
             idsToRemove.push.apply(idsToRemove, __spreadArray([], __read(targetedStructureIds), false));
     };
@@ -48477,8 +48696,8 @@ function isUngrouped(entryStatus) {
 
 function modifyEntriesStatus(_a) {
     var e_1, _b, e_2, _c;
-    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-    var _r = _a.autoEntryPositions, autoEntryPositions = _r === void 0 ? true : _r, ignoreAssignment = _a.ignoreAssignment, // override check for existing assignments
+    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    var _w = _a.autoEntryPositions, autoEntryPositions = _w === void 0 ? true : _w, ignoreAssignment = _a.ignoreAssignment, // override check for existing assignments
     tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, participantIds = _a.participantIds, entryStatus = _a.entryStatus, entryStage = _a.entryStage, extension = _a.extension, // modify the specified extension (remove if value undefined)
     eventSync = _a.eventSync, drawId = _a.drawId, stage = _a.stage, event = _a.event;
     if (!participantIds || !Array.isArray(participantIds))
@@ -48520,7 +48739,7 @@ function modifyEntriesStatus(_a) {
         }).assignedParticipantIds) !== null && _a !== void 0 ? _a : [];
         assignedParticipantIds.push.apply(assignedParticipantIds, __spreadArray([], __read(participantIds), false));
     });
-    var tournamentParticipants = (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [];
+    var tournamentParticipants = (_e = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _e !== void 0 ? _e : [];
     var validEntryStatusForAllParticipantIds = participantIds.every(function (participantId) {
         var _a;
         var participantType = (_a = findParticipant({
@@ -48539,7 +48758,7 @@ function modifyEntriesStatus(_a) {
     if (!validEntryStatusForAllParticipantIds)
         return { error: INVALID_ENTRY_STATUS };
     var flightProfile = event && getFlightProfile({ event: event }).flightProfile;
-    var flight = (_e = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _e === void 0 ? void 0 : _e.find(function (flight) { return flight.drawId === drawId; });
+    var flight = (_f = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _f === void 0 ? void 0 : _f.find(function (flight) { return flight.drawId === drawId; });
     // ------------------------------------------------------------------------
     // reusable functions
     var updateEntryStatus = function (entries) {
@@ -48586,10 +48805,11 @@ function modifyEntriesStatus(_a) {
             ? __assign({}, SUCCESS) : { error: EXISTING_PARTICIPANT_DRAW_POSITION_ASSIGNMENT };
     };
     var autoPosition = function (_a) {
+        var _b;
         var flight = _a.flight, drawDefinition = _a.drawDefinition;
         if (event) {
             event.entries = refreshEntryPositions({
-                entries: event.entries || [],
+                entries: (_b = event.entries) !== null && _b !== void 0 ? _b : [],
             });
         }
         if (flight) {
@@ -48622,18 +48842,17 @@ function modifyEntriesStatus(_a) {
     };
     // ------------------------------------------------------------------------
     // before modifying, if autoEntryPositions: true, pre-assign entryPositions
-    var entryPositionsExist = ((_f = event === null || event === void 0 ? void 0 : event.entries) === null || _f === void 0 ? void 0 : _f.find(function (_a) {
+    var entryPositionsExist = (_h = (_g = event === null || event === void 0 ? void 0 : event.entries) === null || _g === void 0 ? void 0 : _g.find(function (_a) {
+        var entryPosition = _a.entryPosition;
+        return entryPosition;
+    })) !== null && _h !== void 0 ? _h : (((_j = flight === null || flight === void 0 ? void 0 : flight.drawEntries) === null || _j === void 0 ? void 0 : _j.find(function (_a) {
         var entryPosition = _a.entryPosition;
         return entryPosition;
     })) ||
-        ((_g = flight === null || flight === void 0 ? void 0 : flight.drawEntries) === null || _g === void 0 ? void 0 : _g.find(function (_a) {
-            var entryPosition = _a.entryPosition;
-            return entryPosition;
-        })) ||
-        ((_h = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _h === void 0 ? void 0 : _h.find(function (_a) {
+        ((_k = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _k === void 0 ? void 0 : _k.find(function (_a) {
             var entryPosition = _a.entryPosition;
             return entryPosition;
-        }));
+        })));
     if (autoEntryPositions && !entryPositionsExist)
         autoPosition({ flight: flight, drawDefinition: drawDefinition });
     // ------------------------------------------------------------------------
@@ -48645,11 +48864,11 @@ function modifyEntriesStatus(_a) {
     }
     // ------------------------------------------------------------------------
     // update any flights which have no draw generated to keep entries in sync
-    var generatedDrawIds = ((_j = event === null || event === void 0 ? void 0 : event.drawDefinitions) === null || _j === void 0 ? void 0 : _j.map(function (_a) {
+    var generatedDrawIds = (_m = (_l = event === null || event === void 0 ? void 0 : event.drawDefinitions) === null || _l === void 0 ? void 0 : _l.map(function (_a) {
         var drawId = _a.drawId;
         return drawId;
-    })) || [];
-    var flightsNoDraw = ((_k = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _k === void 0 ? void 0 : _k.filter(function (flight) { return !generatedDrawIds.includes(flight.drawId); })) || [];
+    })) !== null && _m !== void 0 ? _m : [];
+    var flightsNoDraw = ((_o = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _o === void 0 ? void 0 : _o.filter(function (flight) { return !generatedDrawIds.includes(flight.drawId); })) || [];
     try {
         for (var flightsNoDraw_1 = __values(flightsNoDraw), flightsNoDraw_1_1 = flightsNoDraw_1.next(); !flightsNoDraw_1_1.done; flightsNoDraw_1_1 = flightsNoDraw_1.next()) {
             var flight_1 = flightsNoDraw_1_1.value;
@@ -48666,8 +48885,8 @@ function modifyEntriesStatus(_a) {
         finally { if (e_1) throw e_1.error; }
     }
     // ------------------------------------------------------------------------
-    var singleDraw = ((_l = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _l === void 0 ? void 0 : _l.length) === 1 &&
-        (((_m = event === null || event === void 0 ? void 0 : event.drawDefinitions) === null || _m === void 0 ? void 0 : _m.length) || 0) <= ((_o = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _o === void 0 ? void 0 : _o.length);
+    var singleDraw = ((_p = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _p === void 0 ? void 0 : _p.length) === 1 &&
+        ((_r = (_q = event === null || event === void 0 ? void 0 : event.drawDefinitions) === null || _q === void 0 ? void 0 : _q.length) !== null && _r !== void 0 ? _r : 0) <= ((_s = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _s === void 0 ? void 0 : _s.length);
     if (!flight &&
         !drawDefinition &&
         entryStatus &&
@@ -48684,7 +48903,7 @@ function modifyEntriesStatus(_a) {
             return decorateResult({ result: result, stack: stack });
         var error_1;
         if (entryStatus === WITHDRAWN) {
-            (_p = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _p === void 0 ? void 0 : _p.every(function (flight) {
+            (_t = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _t === void 0 ? void 0 : _t.every(function (flight) {
                 var result = updateEntryStatus(flight.drawEntries);
                 if (result.error) {
                     error_1 = result.error;
@@ -48696,7 +48915,7 @@ function modifyEntriesStatus(_a) {
                 });
                 return true;
             });
-            (_q = event === null || event === void 0 ? void 0 : event.drawDefinitions) === null || _q === void 0 ? void 0 : _q.every(function (drawDefinition) {
+            (_u = event === null || event === void 0 ? void 0 : event.drawDefinitions) === null || _u === void 0 ? void 0 : _u.every(function (drawDefinition) {
                 var _a;
                 var result = updateEntryStatus(drawDefinition.entries);
                 if (result.error) {
@@ -48716,8 +48935,8 @@ function modifyEntriesStatus(_a) {
     if (autoEntryPositions)
         autoPosition({ flight: flight, drawDefinition: drawDefinition });
     try {
-        for (var _s = __values((event === null || event === void 0 ? void 0 : event.drawDefinitions) || []), _t = _s.next(); !_t.done; _t = _s.next()) {
-            var drawDefinition_1 = _t.value;
+        for (var _x = __values((_v = event === null || event === void 0 ? void 0 : event.drawDefinitions) !== null && _v !== void 0 ? _v : []), _y = _x.next(); !_y.done; _y = _x.next()) {
+            var drawDefinition_1 = _y.value;
             if (modifiedDrawIds.length &&
                 !modifiedDrawIds.includes(drawDefinition_1.drawId))
                 continue;
@@ -48731,7 +48950,7 @@ function modifyEntriesStatus(_a) {
     catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
-            if (_t && !_t.done && (_c = _s.return)) _c.call(_s);
+            if (_y && !_y.done && (_c = _x.return)) _c.call(_x);
         }
         finally { if (e_2) throw e_2.error; }
     }
@@ -49019,8 +49238,8 @@ function participantInFlightEntries(_a) {
 }
 
 function removeEventEntries(_a) {
-    var _b, _c, _d, _e, _f;
-    var _g = _a.autoEntryPositions, autoEntryPositions = _g === void 0 ? true : _g, _h = _a.participantIds, participantIds = _h === void 0 ? [] : _h, entryStatuses = _a.entryStatuses, stage = _a.stage, event = _a.event;
+    var _b, _c, _d, _e, _f, _g;
+    var _h = _a.autoEntryPositions, autoEntryPositions = _h === void 0 ? true : _h, _j = _a.participantIds, participantIds = _j === void 0 ? [] : _j, entryStatuses = _a.entryStatuses, stage = _a.stage, event = _a.event;
     var stack = 'removeEventEntries';
     if (!(event === null || event === void 0 ? void 0 : event.eventId))
         return { error: MISSING_EVENT };
@@ -49070,7 +49289,7 @@ function removeEventEntries(_a) {
     if (!(participantIds === null || participantIds === void 0 ? void 0 : participantIds.length))
         return __assign(__assign({}, SUCCESS), { participantIdsRemoved: [] });
     var participantIdsRemoved = [];
-    event.entries = (event.entries || []).filter(function (entry) {
+    event.entries = ((_e = event.entries) !== null && _e !== void 0 ? _e : []).filter(function (entry) {
         var keepEntry = !participantIds.includes(entry === null || entry === void 0 ? void 0 : entry.participantId);
         if (!keepEntry)
             participantIdsRemoved.push(entry.participantId);
@@ -49083,11 +49302,12 @@ function removeEventEntries(_a) {
     }
     // also remove entry from all flights and drawDefinitions
     var flightProfile = getFlightProfile({ event: event }).flightProfile;
-    (_e = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _e === void 0 ? void 0 : _e.forEach(function (flight) {
+    (_f = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _f === void 0 ? void 0 : _f.forEach(function (flight) {
         flight.drawEntries = (flight.drawEntries || []).filter(function (entry) { return !participantIds.includes(entry.participantId); });
     });
-    (_f = event.drawDefinitions) === null || _f === void 0 ? void 0 : _f.forEach(function (drawDefinition) {
-        drawDefinition.entries = (drawDefinition.entries || []).filter(function (entry) { return !participantIds.includes(entry.participantId); });
+    (_g = event.drawDefinitions) === null || _g === void 0 ? void 0 : _g.forEach(function (drawDefinition) {
+        var _a;
+        drawDefinition.entries = ((_a = drawDefinition.entries) !== null && _a !== void 0 ? _a : []).filter(function (entry) { return !participantIds.includes(entry.participantId); });
     });
     return __assign(__assign({}, SUCCESS), { participantIdsRemoved: participantIdsRemoved });
 }
@@ -49264,6 +49484,7 @@ function addEventEntries(params) {
 
 function removeIndividualParticipantIds(_a) {
     var e_1, _b;
+    var _c, _d, _e;
     var addIndividualParticipantsToEvents = _a.addIndividualParticipantsToEvents, individualParticipantIds = _a.individualParticipantIds, groupingParticipantId = _a.groupingParticipantId, tournamentRecord = _a.tournamentRecord, suppressErrors = _a.suppressErrors;
     var stack = 'removeIndividualParticipantIds';
     if (!tournamentRecord)
@@ -49273,7 +49494,7 @@ function removeIndividualParticipantIds(_a) {
         });
     if (!groupingParticipantId || !individualParticipantIds)
         return decorateResult({ result: { error: MISSING_VALUE }, stack: stack });
-    var tournamentParticipants = tournamentRecord.participants || [];
+    var tournamentParticipants = (_c = tournamentRecord.participants) !== null && _c !== void 0 ? _c : [];
     var groupingParticipant = tournamentParticipants.find(function (participant) {
         return participant.participantId === groupingParticipantId;
     });
@@ -49299,7 +49520,7 @@ function removeIndividualParticipantIds(_a) {
         return decorateResult({ result: result, stack: stack });
     if (addIndividualParticipantsToEvents) {
         var _loop_1 = function (event_1) {
-            var enteredIds = (event_1.entries || [])
+            var enteredIds = ((_e = event_1.entries) !== null && _e !== void 0 ? _e : [])
                 .map(function (_a) {
                 var participantId = _a.participantId;
                 return participantId;
@@ -49316,15 +49537,15 @@ function removeIndividualParticipantIds(_a) {
             }
         };
         try {
-            for (var _c = __values(tournamentRecord.events || []), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var event_1 = _d.value;
+            for (var _f = __values((_d = tournamentRecord.events) !== null && _d !== void 0 ? _d : []), _g = _f.next(); !_g.done; _g = _f.next()) {
+                var event_1 = _g.value;
                 _loop_1(event_1);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -49342,8 +49563,8 @@ function removeIndividualParticipantIds(_a) {
 }
 function removeParticipantIdsFromGroupingParticipant(_a) {
     var _b;
-    var _c;
-    var _d = _a.individualParticipantIds, individualParticipantIds = _d === void 0 ? [] : _d, groupingParticipant = _a.groupingParticipant, tournamentRecord = _a.tournamentRecord, suppressErrors = _a.suppressErrors, mappedMatchUps = _a.mappedMatchUps, participants = _a.participants;
+    var _c, _d;
+    var _e = _a.individualParticipantIds, individualParticipantIds = _e === void 0 ? [] : _e, groupingParticipant = _a.groupingParticipant, tournamentRecord = _a.tournamentRecord, suppressErrors = _a.suppressErrors, mappedMatchUps = _a.mappedMatchUps, participants = _a.participants;
     var removed = [];
     if (!groupingParticipant)
         return { removed: removed };
@@ -49364,9 +49585,9 @@ function removeParticipantIdsFromGroupingParticipant(_a) {
         var eventId = _a.eventId;
         return eventId;
     });
-    var updatedIndividualParticipantIds = (groupingParticipant.individualParticipantIds || []).filter(function (participantId) {
+    var updatedIndividualParticipantIds = ((_d = groupingParticipant.individualParticipantIds) !== null && _d !== void 0 ? _d : []).filter(function (participantId) {
         var e_2, _a, e_3, _b, e_4, _c, e_5, _d;
-        var _e;
+        var _e, _f, _g, _h, _j, _k;
         var targetParticipant = individualParticipantIds === null || individualParticipantIds === void 0 ? void 0 : individualParticipantIds.includes(participantId);
         var scoredParticipantGroupingMatchUps = targetParticipant &&
             ((_e = participants === null || participants === void 0 ? void 0 : participants.find(function (participant) { return participant.participantId === participantId; })) === null || _e === void 0 ? void 0 : _e.matchUps.filter(function (_a) {
@@ -49386,31 +49607,30 @@ function removeParticipantIdsFromGroupingParticipant(_a) {
         if (removeParticipant) {
             removed.push(participantId);
             try {
-                for (var _f = __values(tournamentRecord.events || []), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var event_2 = _g.value;
+                for (var _l = __values((_f = tournamentRecord.events) !== null && _f !== void 0 ? _f : []), _m = _l.next(); !_m.done; _m = _l.next()) {
+                    var event_2 = _m.value;
                     try {
-                        for (var _h = (e_3 = void 0, __values(event_2.drawDefinitions || [])), _j = _h.next(); !_j.done; _j = _h.next()) {
-                            var drawDefinition = _j.value;
+                        for (var _o = (e_3 = void 0, __values((_g = event_2.drawDefinitions) !== null && _g !== void 0 ? _g : [])), _p = _o.next(); !_p.done; _p = _o.next()) {
+                            var drawDefinition = _p.value;
                             var extension = findExtension$2({
                                 element: drawDefinition,
                                 name: LINEUPS,
                             }).extension;
                             var lineUp = extension === null || extension === void 0 ? void 0 : extension.value[groupingParticipant.participantId];
                             if (extension && lineUp) {
-                                lineUp = lineUp.filter(function (assignment) { return assignment.participantId !== participantId; });
+                                extension.value[groupingParticipant.participantId] = lineUp.filter(function (assignment) { return assignment.participantId !== participantId; });
                                 addExtension$1({ element: drawDefinition, extension: extension });
                                 addDrawNotice({ drawDefinition: drawDefinition });
                             }
-                            var matchUps = allDrawMatchUps$1({ drawDefinition: drawDefinition, inContext: false }).matchUps ||
-                                [];
+                            var matchUps = (_h = allDrawMatchUps$1({ drawDefinition: drawDefinition, inContext: false }).matchUps) !== null && _h !== void 0 ? _h : [];
                             try {
                                 for (var matchUps_1 = (e_4 = void 0, __values(matchUps)), matchUps_1_1 = matchUps_1.next(); !matchUps_1_1.done; matchUps_1_1 = matchUps_1.next()) {
                                     var matchUp = matchUps_1_1.value;
-                                    var sides = matchUp.sides || [];
+                                    var sides = (_j = matchUp.sides) !== null && _j !== void 0 ? _j : [];
                                     try {
                                         for (var sides_1 = (e_5 = void 0, __values(sides)), sides_1_1 = sides_1.next(); !sides_1_1.done; sides_1_1 = sides_1.next()) {
                                             var side = sides_1_1.value;
-                                            var lineUp_1 = side.lineUp || [];
+                                            var lineUp_1 = (_k = side.lineUp) !== null && _k !== void 0 ? _k : [];
                                             var containsParticipant = lineUp_1.find(function (assignment) { return assignment.participantId === participantId; });
                                             if (containsParticipant) {
                                                 side.lineUp = lineUp_1.filter(function (assignment) { return assignment.participantId !== participantId; });
@@ -49443,7 +49663,7 @@ function removeParticipantIdsFromGroupingParticipant(_a) {
                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
-                            if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
+                            if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
                         }
                         finally { if (e_3) throw e_3.error; }
                     }
@@ -49452,7 +49672,7 @@ function removeParticipantIdsFromGroupingParticipant(_a) {
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
+                    if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -49475,15 +49695,16 @@ function removeParticipantIdsFromGroupingParticipant(_a) {
         result);
 }
 function removeParticipantIdsFromAllTeams(_a) {
-    var _b = _a.participantRole, participantRole = _b === void 0 ? ParticipantRoleEnum.Competitor : _b, _c = _a.individualParticipantIds, individualParticipantIds = _c === void 0 ? [] : _c, _d = _a.groupingTypes, groupingTypes = _d === void 0 ? [ParticipantTypeEnum.Team, ParticipantTypeEnum.Group] : _d, tournamentRecord = _a.tournamentRecord;
+    var _b;
+    var _c = _a.participantRole, participantRole = _c === void 0 ? ParticipantRoleEnum.Competitor : _c, _d = _a.individualParticipantIds, individualParticipantIds = _d === void 0 ? [] : _d, _e = _a.groupingTypes, groupingTypes = _e === void 0 ? [ParticipantTypeEnum.Team, ParticipantTypeEnum.Group] : _e, tournamentRecord = _a.tournamentRecord;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
-    var tournamentParticipants = tournamentRecord.participants || [];
-    var _e = getParticipants$1({
+    var tournamentParticipants = (_b = tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
+    var _f = getParticipants$1({
         withMatchUps: true,
         tournamentRecord: tournamentRecord,
         withEvents: true,
-    }), participants = _e.participants, mappedMatchUps = _e.mappedMatchUps;
+    }), participants = _f.participants, mappedMatchUps = _f.mappedMatchUps;
     var modifications = 0;
     tournamentParticipants
         .filter(function (participant) {
@@ -49538,10 +49759,11 @@ function deleteParticipants(params) {
         withDraws: true,
     }).participants) !== null && _f !== void 0 ? _f : [];
     var getPlacedPairParticipantIds = function () {
-        var matchUps = allTournamentMatchUps({
+        var _a;
+        var matchUps = (_a = allTournamentMatchUps({
             matchUpFilters: { drawIds: teamDrawIds, matchUpTypes: [DOUBLES$1] },
             tournamentRecord: tournamentRecord,
-        }).matchUps || [];
+        }).matchUps) !== null && _a !== void 0 ? _a : [];
         var placedPairParticipantIds = matchUps
             .map(function (_a) {
             var sides = _a.sides;
@@ -49697,7 +49919,7 @@ function getStageEntries(_a) {
 }
 
 function destroyGroupEntry(_a) {
-    var _b;
+    var _b, _c, _d;
     var removeGroupParticipant = _a.removeGroupParticipant, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, participantId = _a.participantId, drawId = _a.drawId, stage = _a.stage, event = _a.event;
     var stack = 'destroyGroupEntry';
     if (!tournamentRecord)
@@ -49710,7 +49932,7 @@ function destroyGroupEntry(_a) {
         ![TypeEnum.Doubles, TypeEnum.Team].includes(event.eventType)) {
         return decorateResult({ result: { error: INVALID_EVENT_TYPE }, stack: stack });
     }
-    var tournamentParticipants = tournamentRecord.participants || [];
+    var tournamentParticipants = (_b = tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var participant = tournamentParticipants.find(function (participant) { return participant.participantId === participantId; });
     if (!participant) {
         return decorateResult({ result: { error: PARTICIPANT_NOT_FOUND }, stack: stack });
@@ -49721,7 +49943,7 @@ function destroyGroupEntry(_a) {
         (participant.participantType === PAIR && event.eventType !== DOUBLES)) {
         return { error: INVALID_PARTICIPANT_TYPE };
     }
-    var eventEntries = event.entries || [];
+    var eventEntries = (_c = event.entries) !== null && _c !== void 0 ? _c : [];
     var entry = eventEntries.find(function (entry) { return entry.participantId === participantId; });
     if (!entry)
         return { error: PARTICIPANT_ENTRY_NOT_FOUND };
@@ -49746,10 +49968,9 @@ function destroyGroupEntry(_a) {
         .filter(Boolean);
     // find only those individualParticipantIds which do not occur MULTIPLE TIMES in PAIRs/GROUPs in the event.entries or drawEntries
     // this scenario can occur in e.g. ITA tournaments where an individual participant is paired multiple times across flights
-    var individualParticipantIds = (_b = participant.individualParticipantIds) === null || _b === void 0 ? void 0 : _b.filter(function (participantId) {
+    var individualParticipantIds = (_d = participant.individualParticipantIds) === null || _d === void 0 ? void 0 : _d.filter(function (participantId) {
         return arrayIndices(participantId, individualParticipantIdsInGroups).length === 1;
     });
-    // const individualParticipantIds = participant.individualParticipantIds;
     // remove the group participant from event entries
     var result = removeEventEntries({
         participantIds: [participantId],
@@ -49820,16 +50041,6 @@ function destroyPairEntries(params) {
     return destroyedCount ? __assign({ destroyedCount: destroyedCount }, SUCCESS) : { error: errors };
 }
 
-/**
- *
- * @param {string} drawId - id of drawDefinition within which structure is found
- * @param {string} structureId - id of structure of drawPosition
- * @param {number} drawPosition - number of drawPosition for which actions are to be returned
- * @param {boolean} replaceWithBye - boolean whether or not to replace with BYE
- * @param {boolean} destroyPair - if { participantType: PAIR } it is possible to destroy pair entry before modifying entryStatus
- * @param {string} entryStatus - change the entry status of the removed participant to either ALTERNATE or WITHDRAWN
- *
- */
 function removeDrawPositionAssignment(params) {
     var tournamentRecord = params.tournamentRecord, replaceWithBye = params.replaceWithBye, drawDefinition = params.drawDefinition, destroyPair = params.destroyPair, entryStatus = params.entryStatus, matchUpsMap = params.matchUpsMap, drawId = params.drawId;
     var stack = 'removeDrawPositionAssignment';
@@ -49844,7 +50055,7 @@ function removeDrawPositionAssignment(params) {
             tournamentRecord: tournamentRecord_1,
             participantId: participantId,
         }).participant;
-        var _a = participant || {}, participantType = _a.participantType, individualParticipantIds = _a.individualParticipantIds;
+        var _a = participant !== null && participant !== void 0 ? participant : {}, participantType = _a.participantType, individualParticipantIds = _a.individualParticipantIds;
         if (destroyPair && participantType === PAIR) {
             var result_1 = destroyPairEntry({
                 tournamentRecord: tournamentRecord_1,
@@ -53766,13 +53977,14 @@ function getEligibleVoluntaryConsolationParticipants(params) {
 }
 
 function getParticipantEventDetails(_a) {
+    var _b, _c;
     var tournamentRecord = _a.tournamentRecord, participantId = _a.participantId;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!participantId)
         return { error: MISSING_PARTICIPANT_ID };
     // relveantParticipantIds is the target participantId along with any TEAM or PAIR participantIds to which participantId belongs
-    var relevantParticipantIds = [participantId].concat((tournamentRecord.participants || [])
+    var relevantParticipantIds = [participantId].concat(((_b = tournamentRecord.participants) !== null && _b !== void 0 ? _b : [])
         .filter(function (participant) {
         var _a;
         return (participant === null || participant === void 0 ? void 0 : participant.participantType) &&
@@ -53780,9 +53992,10 @@ function getParticipantEventDetails(_a) {
             ((_a = participant.individualParticipantIds) === null || _a === void 0 ? void 0 : _a.includes(participantId));
     })
         .map(function (participant) { return participant.participantId; }));
-    var relevantEvents = (tournamentRecord.events || [])
+    var relevantEvents = ((_c = tournamentRecord.events) !== null && _c !== void 0 ? _c : [])
         .filter(function (event) {
-        var enteredParticipantIds = ((event === null || event === void 0 ? void 0 : event.entries) || []).map(function (entry) { return entry.participantId; });
+        var _a;
+        var enteredParticipantIds = ((_a = event === null || event === void 0 ? void 0 : event.entries) !== null && _a !== void 0 ? _a : []).map(function (entry) { return entry.participantId; });
         return overlap(enteredParticipantIds, relevantParticipantIds);
     })
         .map(function (event) { return ({ eventName: event.eventName, eventId: event.eventId }); });
@@ -53811,6 +54024,7 @@ function getDerivedPositionAssignments(_a) {
 }
 
 function getRelevantParticipantIdsMap(_a) {
+    var _b;
     var processParticipantId = _a.processParticipantId, // optional method which is passed each participantId
     tournamentRecords = _a.tournamentRecords, tournamentRecord = _a.tournamentRecord;
     if (typeof tournamentRecord !== 'object' &&
@@ -53822,7 +54036,7 @@ function getRelevantParticipantIdsMap(_a) {
         ? Object.values(tournamentRecords)
             .map(function (tournamentRecord) { return (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || []; })
             .flat()
-        : (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) || [];
+        : (_b = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var relevantParticipantIdsMap = Object.assign.apply(Object, __spreadArray([{}], __read(allParticipants.map(function (_a) {
         var _b;
         var participantId = _a.participantId, participantType = _a.participantType, individualParticipantIds = _a.individualParticipantIds;
@@ -53900,21 +54114,21 @@ function participantScheduledMatchUps(_a) {
 
 function annotateParticipant(params) {
     var e_1, _a, e_2, _b;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    var _p = params.withScaleValues, withScaleValues = _p === void 0 ? true : _p, eventsPublishStatuses = params.eventsPublishStatuses, _q = params.withEvents, withEvents = _q === void 0 ? true : _q, _r = params.withDraws, withDraws = _r === void 0 ? true : _r, participantIdMap = params.participantIdMap, scheduleAnalysis = params.scheduleAnalysis, derivedDrawInfo = params.derivedDrawInfo, usePublishState = params.usePublishState, withStatistics = params.withStatistics, withOpponents = params.withOpponents, withMatchUps = params.withMatchUps, withSeeding = params.withSeeding, participant = params.participant, withISO2 = params.withISO2, withIOC = params.withIOC;
+    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _q = params.withScaleValues, withScaleValues = _q === void 0 ? true : _q, eventsPublishStatuses = params.eventsPublishStatuses, _r = params.withEvents, withEvents = _r === void 0 ? true : _r, _s = params.withDraws, withDraws = _s === void 0 ? true : _s, participantIdMap = params.participantIdMap, scheduleAnalysis = params.scheduleAnalysis, derivedDrawInfo = params.derivedDrawInfo, usePublishState = params.usePublishState, withStatistics = params.withStatistics, withOpponents = params.withOpponents, withMatchUps = params.withMatchUps, withSeeding = params.withSeeding, participant = params.participant, withISO2 = params.withISO2, withIOC = params.withIOC;
     var scheduleConflicts = [];
     var scheduleItems = [];
     if (withIOC || withISO2)
         addNationalityCode({ participant: participant, withIOC: withIOC, withISO2: withISO2 });
     if (withScaleValues) {
-        var _s = getScaleValues({ participant: participant }), ratings = _s.ratings, rankings = _s.rankings;
+        var _t = getScaleValues({ participant: participant }), ratings = _t.ratings, rankings = _t.rankings;
         participant.rankings = rankings;
         participant.ratings = ratings;
     }
     var participantId = participant === null || participant === void 0 ? void 0 : participant.participantId;
     if (!participantId || !participantIdMap[participantId])
         return {};
-    var _t = participantIdMap[participantId], potentialMatchUps = _t.potentialMatchUps, opponents = _t.opponents, matchUps = _t.matchUps, events = _t.events, losses = _t.losses, draws = _t.draws, wins = _t.wins;
+    var _u = participantIdMap[participantId], potentialMatchUps = _u.potentialMatchUps, opponents = _u.opponents, matchUps = _u.matchUps, events = _u.events, losses = _u.losses, draws = _u.draws, wins = _u.wins;
     var denominator = wins + losses;
     var numerator = wins;
     var statValue = denominator && numerator / denominator;
@@ -53972,7 +54186,7 @@ function annotateParticipant(params) {
                     _b);
             })), false));
             var _loop_1 = function (participantEvent) {
-                var e_3, _u, e_4, _v, e_5, _w;
+                var e_3, _v, e_4, _w, e_5, _x;
                 var getScaleAccessor = function (scaleName) {
                     return [SCALE$1, SEEDING$1, participantEvent.eventType, scaleName].join('.');
                 };
@@ -54024,15 +54238,15 @@ function annotateParticipant(params) {
                     participantEvent.seedAssignments = seedAssignments;
                 }
                 else {
-                    var _x = participantEvent.category || {}, categoryName = _x.categoryName, ageCategoryCode = _x.ageCategoryCode;
+                    var _y = participantEvent.category || {}, categoryName = _y.categoryName, ageCategoryCode = _y.ageCategoryCode;
                     var scaleItem = void 0;
                     try {
-                        for (var _y = (e_3 = void 0, __values([
+                        for (var _z = (e_3 = void 0, __values([
                             participantEvent.eventId,
                             ageCategoryCode,
                             categoryName,
-                        ])), _z = _y.next(); !_z.done; _z = _y.next()) {
-                            var scaleName = _z.value;
+                        ])), _0 = _z.next(); !_0.done; _0 = _z.next()) {
+                            var scaleName = _0.value;
                             var scaleAttributes = {
                                 eventType: participantEvent.eventType,
                                 scaleType: SEEDING$1,
@@ -54051,7 +54265,7 @@ function annotateParticipant(params) {
                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
-                            if (_z && !_z.done && (_u = _y.return)) _u.call(_y);
+                            if (_0 && !_0.done && (_v = _z.return)) _v.call(_z);
                         }
                         finally { if (e_3) throw e_3.error; }
                     }
@@ -54068,8 +54282,8 @@ function annotateParticipant(params) {
                 }
                 if ((_k = participantEvent.drawIds) === null || _k === void 0 ? void 0 : _k.length) {
                     try {
-                        for (var _0 = (e_4 = void 0, __values(participantEvent.drawIds || [])), _1 = _0.next(); !_1.done; _1 = _0.next()) {
-                            var flightDrawId = _1.value;
+                        for (var _1 = (e_4 = void 0, __values(participantEvent.drawIds || [])), _2 = _1.next(); !_2.done; _2 = _1.next()) {
+                            var flightDrawId = _2.value;
                             var drawSeedPublishingDisabled = ((_l = publishedSeeding === null || publishedSeeding === void 0 ? void 0 : publishedSeeding.drawIds) === null || _l === void 0 ? void 0 : _l.length) &&
                                 !((_m = publishedSeeding === null || publishedSeeding === void 0 ? void 0 : publishedSeeding.drawIds) === null || _m === void 0 ? void 0 : _m.includes(flightDrawId));
                             if (eventSeedingPublished && !drawSeedPublishingDisabled) {
@@ -54081,15 +54295,15 @@ function annotateParticipant(params) {
                                 // preserve filtering of MAIN/QUALIFYING seedValues, if present
                                 if (seedAssignments && participantEvent.seedAssignments) {
                                     try {
-                                        for (var _2 = (e_5 = void 0, __values(Object.keys(participantEvent.seedAssignments))), _3 = _2.next(); !_3.done; _3 = _2.next()) {
-                                            var key = _3.value;
+                                        for (var _3 = (e_5 = void 0, __values(Object.keys(participantEvent.seedAssignments))), _4 = _3.next(); !_4.done; _4 = _3.next()) {
+                                            var key = _4.value;
                                             participantEvent.seedAssignments[key] = seedAssignments[key];
                                         }
                                     }
                                     catch (e_5_1) { e_5 = { error: e_5_1 }; }
                                     finally {
                                         try {
-                                            if (_3 && !_3.done && (_w = _2.return)) _w.call(_2);
+                                            if (_4 && !_4.done && (_x = _3.return)) _x.call(_3);
                                         }
                                         finally { if (e_5) throw e_5.error; }
                                     }
@@ -54103,7 +54317,7 @@ function annotateParticipant(params) {
                     catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
-                            if (_1 && !_1.done && (_v = _0.return)) _v.call(_0);
+                            if (_2 && !_2.done && (_w = _1.return)) _w.call(_1);
                         }
                         finally { if (e_4) throw e_4.error; }
                     }
@@ -54139,9 +54353,9 @@ function annotateParticipant(params) {
     }
     var allParticipantMatchUps = participantMatchUps.concat(participantPotentialMatchUps);
     // scheduledMatchUps are a participant's matchUps separated by date and sorted by scheduledTime
-    var scheduledMatchUps = ((_o = participantScheduledMatchUps({
+    var scheduledMatchUps = (_p = (_o = participantScheduledMatchUps({
         matchUps: allParticipantMatchUps,
-    })) === null || _o === void 0 ? void 0 : _o.scheduledMatchUps) || [];
+    })) === null || _o === void 0 ? void 0 : _o.scheduledMatchUps) !== null && _p !== void 0 ? _p : [];
     var scheduledMinutesDifference = (scheduleAnalysis || {}).scheduledMinutesDifference;
     var dates = Object.keys(scheduledMatchUps);
     dates.forEach(function (date) {
@@ -54967,7 +55181,7 @@ function getParticipantMembership(_a) {
         participantFilters: { participantTypes: [TEAM, PAIR, GROUP] },
         tournamentRecord: tournamentRecord,
     }).participants;
-    var memberOf = (participants || []).filter(function (participant) {
+    var memberOf = (participants !== null && participants !== void 0 ? participants : []).filter(function (participant) {
         var _a;
         return (_a = participant.individualParticipantIds) === null || _a === void 0 ? void 0 : _a.includes(participantId);
     });
@@ -54984,16 +55198,17 @@ function getParticipantMembership(_a) {
 
 function getParticipantSchedules(_a) {
     var e_1, _b;
-    var _c = _a.participantFilters, participantFilters = _c === void 0 ? {} : _c, tournamentRecord = _a.tournamentRecord;
+    var _c, _d, _e;
+    var _f = _a.participantFilters, participantFilters = _f === void 0 ? {} : _f, tournamentRecord = _a.tournamentRecord;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (typeof participantFilters !== 'object')
         return { error: INVALID_OBJECT, context: { participantFilters: participantFilters } };
     var contextFilters = { eventIds: participantFilters.eventIds };
-    var matchUps = allTournamentMatchUps({
+    var matchUps = (_c = allTournamentMatchUps({
         tournamentRecord: tournamentRecord,
         contextFilters: contextFilters,
-    }).matchUps || [];
+    }).matchUps) !== null && _c !== void 0 ? _c : [];
     var matchUpsMap = Object.assign.apply(Object, __spreadArray([{}], __read(matchUps.map(function (matchUp) {
         var _a;
         return (_a = {}, _a[matchUp.matchUpId] = matchUp, _a);
@@ -55002,33 +55217,31 @@ function getParticipantSchedules(_a) {
         var schedule = _a.schedule;
         return schedule && Object.keys(schedule).length;
     });
-    var sourceMatchUpIds = getMatchUpDependencies({
+    var sourceMatchUpIds = (_d = getMatchUpDependencies({
         tournamentRecord: tournamentRecord,
         matchUps: matchUps,
-    }).sourceMatchUpIds || [];
+    }).sourceMatchUpIds) !== null && _d !== void 0 ? _d : [];
     var participantAggregator = {};
     var _loop_1 = function (matchUp) {
-        var e_2, _d, e_3, _e;
+        var e_2, _g, e_3, _h;
         var sides = matchUp.sides;
         var relevantSourceMatchUps;
-        var participants = (sides === null || sides === void 0 ? void 0 : sides.map(function (side) {
+        var participants = (_e = sides === null || sides === void 0 ? void 0 : sides.map(function (side) {
             var _a;
             if (side.participant) {
                 return (_a = [side.participant]).concat.apply(_a, __spreadArray([], __read((side.participant.individualParticipants || [])), false));
             }
-            else {
-                if (sourceMatchUpIds[matchUp.matchUpId] &&
-                    !relevantSourceMatchUps) {
-                    relevantSourceMatchUps = (sourceMatchUpIds[matchUp.matchUpId] || [])
-                        .map(function (matchUpId) { return matchUpsMap[matchUpId]; })
-                        .filter(function (_a) {
-                        var winningSide = _a.winningSide, bye = _a.bye;
-                        return !winningSide && !bye;
-                    });
-                }
+            else if (sourceMatchUpIds[matchUp.matchUpId] &&
+                !relevantSourceMatchUps) {
+                relevantSourceMatchUps = (sourceMatchUpIds[matchUp.matchUpId] || [])
+                    .map(function (matchUpId) { return matchUpsMap[matchUpId]; })
+                    .filter(function (_a) {
+                    var winningSide = _a.winningSide, bye = _a.bye;
+                    return !winningSide && !bye;
+                });
             }
             return undefined;
-        }).filter(Boolean).flat()) || [];
+        }).filter(Boolean).flat()) !== null && _e !== void 0 ? _e : [];
         try {
             for (var participants_1 = (e_2 = void 0, __values(participants)), participants_1_1 = participants_1.next(); !participants_1_1.done; participants_1_1 = participants_1.next()) {
                 var participant = participants_1_1.value;
@@ -55046,7 +55259,7 @@ function getParticipantSchedules(_a) {
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (participants_1_1 && !participants_1_1.done && (_d = participants_1.return)) _d.call(participants_1);
+                if (participants_1_1 && !participants_1_1.done && (_g = participants_1.return)) _g.call(participants_1);
             }
             finally { if (e_2) throw e_2.error; }
         }
@@ -55075,7 +55288,7 @@ function getParticipantSchedules(_a) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (potentialParticipants_1_1 && !potentialParticipants_1_1.done && (_e = potentialParticipants_1.return)) _e.call(potentialParticipants_1);
+                if (potentialParticipants_1_1 && !potentialParticipants_1_1.done && (_h = potentialParticipants_1.return)) _h.call(potentialParticipants_1);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -55146,8 +55359,8 @@ var participantRoles = {
 // add persons to a tournamentRecord and create participants in the process
 // include ability to specify a doubles partner by personId
 function addPersons(_a) {
-    var _b;
-    var _c = _a.participantRole, participantRole = _c === void 0 ? COMPETITOR : _c, tournamentRecord = _a.tournamentRecord, persons = _a.persons;
+    var _b, _c;
+    var _d = _a.participantRole, participantRole = _d === void 0 ? COMPETITOR : _d, tournamentRecord = _a.tournamentRecord, persons = _a.persons;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!Array.isArray(persons))
@@ -55206,10 +55419,10 @@ function addPersons(_a) {
         return result;
     addedIndividualParticipantsCount = result.addedCount || 0;
     var pairParticipants = [];
-    var tournamentParticipants = ((_b = getParticipants$1({
+    var tournamentParticipants = (_c = (_b = getParticipants$1({
         participantFilters: { participantTypes: [INDIVIDUAL] },
         tournamentRecord: tournamentRecord,
-    })) === null || _b === void 0 ? void 0 : _b.participants) || [];
+    })) === null || _b === void 0 ? void 0 : _b.participants) !== null && _c !== void 0 ? _c : [];
     if (participantRole === COMPETITOR) {
         persons
             .filter(function (_a) {
@@ -55291,6 +55504,7 @@ function updateTeamEventEntries(_a) {
 
 function addIndividualParticipantIds(_a) {
     var _b;
+    var _c;
     var individualParticipantIds = _a.individualParticipantIds, groupingParticipantId = _a.groupingParticipantId, removeFromOtherTeams = _a.removeFromOtherTeams, tournamentRecord = _a.tournamentRecord;
     var stack = 'addIndividualParticipantIds';
     if (!tournamentRecord)
@@ -55300,7 +55514,7 @@ function addIndividualParticipantIds(_a) {
         });
     if (!groupingParticipantId || !individualParticipantIds)
         return decorateResult({ result: { error: MISSING_VALUE }, stack: stack });
-    var tournamentParticipants = tournamentRecord.participants || [];
+    var tournamentParticipants = (_c = tournamentRecord.participants) !== null && _c !== void 0 ? _c : [];
     var groupingParticipant = tournamentParticipants.find(function (participant) { return participant.participantId === groupingParticipantId; });
     if (!groupingParticipant)
         return decorateResult({ result: { error: PARTICIPANT_NOT_FOUND }, stack: stack });
@@ -55443,13 +55657,13 @@ function modifyIndividualParticipantIds(_a) {
 
 function generateTeamsFromParticipantAttribute(_a) {
     var e_1, _b;
-    var _c, _d;
-    var _e = _a.addParticipants, addParticipants = _e === void 0 ? true : _e, // optional boolean to disable add
+    var _c, _d, _e, _f, _g, _h;
+    var _j = _a.addParticipants, addParticipants = _j === void 0 ? true : _j, // optional boolean to disable add
     participantAttribute = _a.participantAttribute, tournamentRecord = _a.tournamentRecord, personAttribute = _a.personAttribute, teamNames = _a.teamNames, accessor = _a.accessor, uuids = _a.uuids;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     var teams = {};
-    var individualParticipants = (tournamentRecord.participants || []).filter(function (_a) {
+    var individualParticipants = ((_c = tournamentRecord.participants) !== null && _c !== void 0 ? _c : []).filter(function (_a) {
         var participantType = _a.participantType, participantRole = _a.participantRole;
         return participantType === INDIVIDUAL && participantRole === COMPETITOR;
     });
@@ -55458,25 +55672,25 @@ function generateTeamsFromParticipantAttribute(_a) {
         for (var individualParticipants_1 = __values(individualParticipants), individualParticipants_1_1 = individualParticipants_1.next(); !individualParticipants_1_1.done; individualParticipants_1_1 = individualParticipants_1.next()) {
             var individualParticipant = individualParticipants_1_1.value;
             var accessorValue = accessor &&
-                ((_c = getAccessorValue({
+                ((_d = getAccessorValue({
                     element: individualParticipant,
                     accessor: accessor,
-                })) === null || _c === void 0 ? void 0 : _c.value);
+                })) === null || _d === void 0 ? void 0 : _d.value);
             var attributeValue = accessorValue ||
-                (personAttribute && ((_d = individualParticipant.person) === null || _d === void 0 ? void 0 : _d[personAttribute])) ||
+                (personAttribute && ((_e = individualParticipant.person) === null || _e === void 0 ? void 0 : _e[personAttribute])) ||
                 (participantAttribute && individualParticipant[participantAttribute]);
             if (attributeValue) {
                 if (!Object.keys(teams).includes(attributeValue)) {
                     teams[attributeValue] = {
-                        participantName: (teamNames === null || teamNames === void 0 ? void 0 : teamNames[teamIndex]) || attributeValue,
-                        participantId: (uuids === null || uuids === void 0 ? void 0 : uuids.pop()) || UUID(),
+                        participantName: (_f = teamNames === null || teamNames === void 0 ? void 0 : teamNames[teamIndex]) !== null && _f !== void 0 ? _f : attributeValue,
+                        participantId: (_g = uuids === null || uuids === void 0 ? void 0 : uuids.pop()) !== null && _g !== void 0 ? _g : UUID(),
                         individualParticipantIds: [],
                         participantRole: COMPETITOR,
                         participantType: TEAM,
                     };
                     var extension = {
+                        value: personAttribute !== null && personAttribute !== void 0 ? personAttribute : participantAttribute,
                         name: GROUPING_ATTRIBUTE,
-                        value: personAttribute || participantAttribute,
                     };
                     addExtension$1({ element: teams[attributeValue], extension: extension });
                     teamIndex += 1;
@@ -55493,7 +55707,7 @@ function generateTeamsFromParticipantAttribute(_a) {
         finally { if (e_1) throw e_1.error; }
     }
     var groupingAttributes = Object.keys(teams);
-    var overlappingTeamParticipantIds = (tournamentRecord.participants || [])
+    var overlappingTeamParticipantIds = ((_h = tournamentRecord.participants) !== null && _h !== void 0 ? _h : [])
         .map(function (participant) {
         if (participant.participantType !== TEAM)
             return undefined;
@@ -55605,14 +55819,14 @@ function modifyParticipantsSignInStatus(_a) {
 
 function scaledTeamAssignment(_a) {
     var _b, e_1, _c, e_2, _d, e_3, _e, e_4, _f, e_5, _g, e_6, _h, e_7, _j;
-    var _k, _l, _m, _o, _p;
-    var _q = _a.clearExistingAssignments, clearExistingAssignments = _q === void 0 ? true : _q, // by default remove all existing individualParticipantIds from targeted teams
+    var _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+    var _x = _a.clearExistingAssignments, clearExistingAssignments = _x === void 0 ? true : _x, // by default remove all existing individualParticipantIds from targeted teams
     individualParticipantIds = _a.individualParticipantIds, // if scaledParticipants are provided, individualParticipants is ignored
     reverseAssignmentOrder = _a.reverseAssignmentOrder, // optional - reverses team order; useful for sequential assignment of participant groupings to ensure balanced distribution
-    _r = _a.initialTeamIndex, // optional - reverses team order; useful for sequential assignment of participant groupings to ensure balanced distribution
-    initialTeamIndex = _r === void 0 ? 0 : _r, // optional - allows assignment to begin at a specified array index; useful for sequential assignment of groups of scaledParticipants
-    _s = _a.scaledParticipants, // optional - allows assignment to begin at a specified array index; useful for sequential assignment of groups of scaledParticipants
-    scaledParticipants = _s === void 0 ? [] : _s, // optional - either scaledParticipants or (individualParticipantIds and scaleName) must be provided
+    _y = _a.initialTeamIndex, // optional - reverses team order; useful for sequential assignment of participant groupings to ensure balanced distribution
+    initialTeamIndex = _y === void 0 ? 0 : _y, // optional - allows assignment to begin at a specified array index; useful for sequential assignment of groups of scaledParticipants
+    _z = _a.scaledParticipants, // optional - allows assignment to begin at a specified array index; useful for sequential assignment of groups of scaledParticipants
+    scaledParticipants = _z === void 0 ? [] : _z, // optional - either scaledParticipants or (individualParticipantIds and scaleName) must be provided
     teamParticipantIds = _a.teamParticipantIds, // optional, IF teamsCount is provided then teams will be created
     tournamentRecord = _a.tournamentRecord, // supplied automatically by tournamentEngine
     scaleAttributes = _a.scaleAttributes, // ignored if scaledParticipants are provided; { scaleName, scaleType, sortOrder, eventType }
@@ -55650,23 +55864,22 @@ function scaledTeamAssignment(_a) {
             error: MISSING_VALUE,
         };
     }
-    var participantIdsToAssign = individualParticipantIds ||
-        scaledParticipants.map(function (_a) {
-            var participantId = _a.participantId;
-            return participantId;
-        });
+    var participantIdsToAssign = individualParticipantIds !== null && individualParticipantIds !== void 0 ? individualParticipantIds : scaledParticipants.map(function (_a) {
+        var participantId = _a.participantId;
+        return participantId;
+    });
     if (reverseAssignmentOrder) {
         teamParticipantIds === null || teamParticipantIds === void 0 ? void 0 : teamParticipantIds.reverse();
         initialTeamIndex += 1; // ensures that the targeted team remains the first team to receive an assignment
     }
     if (initialTeamIndex > ((teamParticipantIds === null || teamParticipantIds === void 0 ? void 0 : teamParticipantIds.length) || 0) - 1)
         initialTeamIndex = 0;
-    var orderedTeamParticipantIds = (teamParticipantIds === null || teamParticipantIds === void 0 ? void 0 : (_b = teamParticipantIds.slice(initialTeamIndex)).concat.apply(_b, __spreadArray([], __read(teamParticipantIds.slice(0, initialTeamIndex)), false))) || [];
+    var orderedTeamParticipantIds = (_l = teamParticipantIds === null || teamParticipantIds === void 0 ? void 0 : (_b = teamParticipantIds.slice(initialTeamIndex)).concat.apply(_b, __spreadArray([], __read(teamParticipantIds.slice(0, initialTeamIndex)), false))) !== null && _l !== void 0 ? _l : [];
     var relevantTeams = [];
     try {
         // build up an array of targeted TEAM participants
-        for (var _t = __values(tournamentRecord.participants || []), _u = _t.next(); !_u.done; _u = _t.next()) {
-            var participant = _u.value;
+        for (var _0 = __values((_m = tournamentRecord.participants) !== null && _m !== void 0 ? _m : []), _1 = _0.next(); !_1.done; _1 = _0.next()) {
+            var participant = _1.value;
             var participantId = participant.participantId, participantType = participant.participantType;
             if (!orderedTeamParticipantIds.includes(participantId))
                 continue;
@@ -55678,28 +55891,28 @@ function scaledTeamAssignment(_a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_u && !_u.done && (_c = _t.return)) _c.call(_t);
+            if (_1 && !_1.done && (_c = _0.return)) _c.call(_0);
         }
         finally { if (e_1) throw e_1.error; }
     }
     if (teamsCount && relevantTeams.length < teamsCount) {
         var addCount = teamsCount - ((relevantTeams === null || relevantTeams === void 0 ? void 0 : relevantTeams.length) || 0);
-        var nameBase_1 = teamNameBase || 'Team';
+        var nameBase_1 = teamNameBase !== null && teamNameBase !== void 0 ? teamNameBase : 'Team';
         var teamParticipants = generateRange(0, addCount).map(function (i) { return ({
             participantName: "".concat(nameBase_1, " ").concat(i + 1),
             participantType: TEAM_PARTICIPANT,
             participantRole: COMPETITOR,
         }); });
-        var _v = addParticipants({
+        var _2 = addParticipants({
             participants: teamParticipants,
             returnParticipants: true,
             tournamentRecord: tournamentRecord,
-        }).participants, participants = _v === void 0 ? [] : _v;
+        }).participants, participants = _2 === void 0 ? [] : _2;
         var addedParticipantIds_1 = participants.map(getParticipantId);
-        var addedParticipants = (_m = (_l = tournamentRecord.participants) === null || _l === void 0 ? void 0 : _l.filter(function (_a) {
+        var addedParticipants = (_p = (_o = tournamentRecord.participants) === null || _o === void 0 ? void 0 : _o.filter(function (_a) {
             var participantId = _a.participantId;
             return addedParticipantIds_1.includes(participantId);
-        })) !== null && _m !== void 0 ? _m : [];
+        })) !== null && _p !== void 0 ? _p : [];
         relevantTeams.push.apply(relevantTeams, __spreadArray([], __read(addedParticipants), false));
     }
     if (!relevantTeams.length)
@@ -55739,19 +55952,19 @@ function scaledTeamAssignment(_a) {
     }
     if (!scaledParticipants.length) {
         try {
-            for (var _w = __values(tournamentRecord.participants || []), _x = _w.next(); !_x.done; _x = _w.next()) {
-                var participant = _x.value;
+            for (var _3 = __values((_q = tournamentRecord.participants) !== null && _q !== void 0 ? _q : []), _4 = _3.next(); !_4.done; _4 = _3.next()) {
+                var participant = _4.value;
                 var participantId = participant.participantId, participantType = participant.participantType;
                 if (!participantIdsToAssign.includes(participantId))
                     continue;
                 if (participantType !== INDIVIDUAL)
                     return { error: INVALID_PARTICIPANT_TYPE, participant: participant };
-                var scaleItem = (_o = participantScaleItem({
+                var scaleItem = (_r = participantScaleItem({
                     scaleAttributes: scaleAttributes,
                     participant: participant,
-                })) === null || _o === void 0 ? void 0 : _o.scaleItem;
+                })) === null || _r === void 0 ? void 0 : _r.scaleItem;
                 var scaleValue = (scaleAttributes === null || scaleAttributes === void 0 ? void 0 : scaleAttributes.accessor)
-                    ? (_p = scaleItem === null || scaleItem === void 0 ? void 0 : scaleItem.scaleValue) === null || _p === void 0 ? void 0 : _p[scaleAttributes === null || scaleAttributes === void 0 ? void 0 : scaleAttributes.accessor]
+                    ? (_s = scaleItem === null || scaleItem === void 0 ? void 0 : scaleItem.scaleValue) === null || _s === void 0 ? void 0 : _s[scaleAttributes === null || scaleAttributes === void 0 ? void 0 : scaleAttributes.accessor]
                     : scaleItem === null || scaleItem === void 0 ? void 0 : scaleItem.scaleValue;
                 var scaledParticipant = { participantId: participantId, scaleValue: scaleValue };
                 scaledParticipants.push(scaledParticipant);
@@ -55760,7 +55973,7 @@ function scaledTeamAssignment(_a) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_x && !_x.done && (_e = _w.return)) _e.call(_w);
+                if (_4 && !_4.done && (_e = _3.return)) _e.call(_3);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -55811,11 +56024,11 @@ function scaledTeamAssignment(_a) {
     try {
         // for all events, check if any relevant teams are present
         // if a relevant team is present, remove any UNGROUPED participants that are part of that team
-        for (var _y = __values(tournamentRecord.events || []), _z = _y.next(); !_z.done; _z = _y.next()) {
-            var event_1 = _z.value;
+        for (var _5 = __values((_t = tournamentRecord.events) !== null && _t !== void 0 ? _t : []), _6 = _5.next(); !_6.done; _6 = _5.next()) {
+            var event_1 = _6.value;
             if (event_1.eventType !== TEAM_EVENT)
                 continue;
-            var relevantTeamEntries = (event_1.entries || []).filter(function (entry) {
+            var relevantTeamEntries = ((_u = event_1.entries) !== null && _u !== void 0 ? _u : []).filter(function (entry) {
                 return relevantTeamParticipantIds.includes(entry.participantId);
             });
             var _loop_1 = function (relevantEntry) {
@@ -55825,10 +56038,11 @@ function scaledTeamAssignment(_a) {
                 });
                 var individualParticipantIds_1 = relevantTeam === null || relevantTeam === void 0 ? void 0 : relevantTeam.individualParticipantIds;
                 // remove any relevant individualParticipant entries from event.entries
-                event_1.entries = (event_1.entries || []).filter(function (entry) { return !individualParticipantIds_1.includes(entry.participantId); });
+                event_1.entries = ((_v = event_1.entries) !== null && _v !== void 0 ? _v : []).filter(function (entry) { return !individualParticipantIds_1.includes(entry.participantId); });
                 // also remove any relevant individualParticipant entries from drawDefinition.entries
-                (event_1.drawDefinitions || []).forEach(function (drawDefinition) {
-                    drawDefinition.entries = (drawDefinition.entries || []).filter(function (entry) { return !individualParticipantIds_1.includes(entry.participantId); });
+                ((_w = event_1.drawDefinitions) !== null && _w !== void 0 ? _w : []).forEach(function (drawDefinition) {
+                    var _a;
+                    drawDefinition.entries = ((_a = drawDefinition.entries) !== null && _a !== void 0 ? _a : []).filter(function (entry) { return !individualParticipantIds_1.includes(entry.participantId); });
                 });
                 // also remove any relevant individualParticipant any flight.drawEntries
                 var flightProfile = getFlightProfile({ event: event_1 }).flightProfile;
@@ -55854,7 +56068,7 @@ function scaledTeamAssignment(_a) {
     catch (e_6_1) { e_6 = { error: e_6_1 }; }
     finally {
         try {
-            if (_z && !_z.done && (_h = _y.return)) _h.call(_y);
+            if (_6 && !_6.done && (_h = _5.return)) _h.call(_5);
         }
         finally { if (e_6) throw e_6.error; }
     }
@@ -56758,76 +56972,6 @@ function unPublishEvent(_a) {
     return __assign({ eventId: event.eventId }, SUCCESS);
 }
 
-/**
- * return an array of arrays of grouped structureIds => structureGroups
- * the expectation is that all structures within a drawDefintion are linked
- * return a boolean whether this condition is met => allSructuresLinked
- */
-function getStructureGroups(_a) {
-    var drawDefinition = _a.drawDefinition;
-    var links = drawDefinition.links || [];
-    var sourceStructureIds = {};
-    var hasDrawFeedProfile = {};
-    var linkedStructureIds = links.map(function (link) {
-        var sourceId = link.source.structureId;
-        var targetId = link.target.structureId;
-        hasDrawFeedProfile[targetId] =
-            hasDrawFeedProfile[targetId] || link.target.feedProfile === DRAW;
-        sourceStructureIds[targetId] = unique(__spreadArray(__spreadArray([], __read((sourceStructureIds[targetId] || [])), false), [
-            sourceId,
-        ], false)).filter(Boolean);
-        return [link.source.structureId, link.target.structureId];
-    });
-    // iterate through all groups of structureIds to flatten tree of links between structures
-    var iterations = linkedStructureIds.length;
-    generateRange(0, Math.ceil(iterations / 2)).forEach(function () {
-        linkedStructureIds = generateRange(0, iterations).map(function (index) {
-            var structureIds = linkedStructureIds[index];
-            var mergedWithOverlappingIds = linkedStructureIds.reduce(function (biggest, ids) {
-                var hasOverlap = overlap(structureIds, ids);
-                return hasOverlap ? biggest.concat.apply(biggest, __spreadArray([], __read(ids), false)) : biggest;
-            }, []) || [];
-            return unique(structureIds.concat.apply(structureIds, __spreadArray([], __read(mergedWithOverlappingIds), false)));
-        });
-    });
-    // at this point all linkedStructureIds arrays should be equivalent
-    // use the first of these as the identity array
-    var groupedStructureIds = linkedStructureIds[0];
-    // utility method to recognize equivalent arrays of structureIds
-    var identityLink = function (a, b) { return intersection(a, b).length === a.length; };
-    // check that all arrays of linkedStructureIds are equivalent to identity array
-    var allLinkStructuresLinked = linkedStructureIds
-        .slice(1)
-        .reduce(function (allLinkStructuresLinked, ids) {
-        return allLinkStructuresLinked && identityLink(ids, groupedStructureIds);
-    }, true);
-    // if a drawDefinition contains no links then no structure groups will exist
-    // filter out undefined when there are no links in a drawDefinition
-    var structureGroups = [groupedStructureIds].filter(Boolean);
-    // this is the same as structureGroups, but excludes VOLUNTARY_CONSOLATION
-    var linkCheck = [groupedStructureIds].filter(Boolean);
-    // iterate through all structures to add missing structureIds
-    var structures = drawDefinition.structures || [];
-    structures.forEach(function (structure) {
-        var structureId = structure.structureId, stage = structure.stage;
-        var existingGroup = structureGroups.find(function (group) {
-            return group.includes(structureId);
-        });
-        if (!existingGroup) {
-            structureGroups.push([structureId]);
-            if (stage !== VOLUNTARY_CONSOLATION)
-                linkCheck.push(structureId);
-        }
-    });
-    var allStructuresLinked = allLinkStructuresLinked && linkCheck.length === 1;
-    return {
-        allStructuresLinked: allStructuresLinked,
-        sourceStructureIds: sourceStructureIds,
-        hasDrawFeedProfile: hasDrawFeedProfile,
-        structureGroups: structureGroups,
-    };
-}
-
 function getDrawData(params) {
     var _a = params.tournamentParticipants, tournamentParticipants = _a === void 0 ? [] : _a, includePositionAssignments = params.includePositionAssignments, policyDefinitions = params.policyDefinitions, tournamentRecord = params.tournamentRecord, _b = params.inContext, inContext = _b === void 0 ? true : _b, drawDefinition = params.drawDefinition, noDeepCopy = params.noDeepCopy, sortConfig = params.sortConfig, context = params.context, event = params.event;
     if (!drawDefinition)
@@ -56872,13 +57016,20 @@ function getDrawData(params) {
             .sort(function (a, b) { return structureSort(a, b, sortConfig); })
             .map(function (structure) {
             var _a;
-            var structureId = structure.structureId;
+            if (!structure)
+                return;
+            var structureId = structure === null || structure === void 0 ? void 0 : structure.structureId;
             var seedAssignments = [];
             // pass seedAssignments from { stageSequence: 1 } to other stages
-            if ([MAIN, CONSOLATION, PLAY_OFF].includes(structure.stage)) {
+            if (structure.stage &&
+                [
+                    StageTypeEnum.Main,
+                    StageTypeEnum.Consolation,
+                    StageTypeEnum.PlayOff,
+                ].includes(structure.stage)) {
                 seedAssignments = mainStageSeedAssignments;
             }
-            if (structure.stage === QUALIFYING) {
+            if ((structure === null || structure === void 0 ? void 0 : structure.stage) === QUALIFYING) {
                 seedAssignments = qualificationStageSeedAssignments;
             }
             var _b = getAllStructureMatchUps({
@@ -56911,16 +57062,18 @@ function getDrawData(params) {
                     participantResult: extension.value,
                 });
             }).filter(function (f) { return f === null || f === void 0 ? void 0 : f.participantResult; });
-            var structureInfo = (function (_a) {
-                var stageSequence = _a.stageSequence, structureName = _a.structureName, structureType = _a.structureType, matchUpFormat = _a.matchUpFormat, stage = _a.stage;
-                return ({
-                    stageSequence: stageSequence,
-                    structureName: structureName,
-                    structureType: structureType,
-                    matchUpFormat: matchUpFormat,
-                    stage: stage,
-                });
-            })(structure);
+            var structureInfo = structure
+                ? (function (_a) {
+                    var stageSequence = _a.stageSequence, structureName = _a.structureName, structureType = _a.structureType, matchUpFormat = _a.matchUpFormat, stage = _a.stage;
+                    return ({
+                        stageSequence: stageSequence,
+                        structureName: structureName,
+                        structureType: structureType,
+                        matchUpFormat: matchUpFormat,
+                        stage: stage,
+                    });
+                })(structure)
+                : {};
             structureInfo.sourceStructureIds = sourceStructureIds[structureId];
             structureInfo.hasDrawFeedProfile = hasDrawFeedProfile[structureId];
             structureInfo.positionAssignments = positionAssignments;
@@ -57077,9 +57230,9 @@ function getEventData(params) {
 
 function publishEvent(params) {
     var _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     var policyDefinitions = params.policyDefinitions, drawIds = params.drawIds, structureIds = params.structureIds, stages = params.stages;
-    var includePositionAssignments = params.includePositionAssignments, removePriorValues = params.removePriorValues, tournamentRecord = params.tournamentRecord, _m = params.status, status = _m === void 0 ? PUBLIC : _m, event = params.event, drawIdsToRemove = params.drawIdsToRemove, drawIdsToAdd = params.drawIdsToAdd, stagesToRemove = params.stagesToRemove, stagesToAdd = params.stagesToAdd, structureIdsToRemove = params.structureIdsToRemove, structureIdsToAdd = params.structureIdsToAdd;
+    var includePositionAssignments = params.includePositionAssignments, removePriorValues = params.removePriorValues, tournamentRecord = params.tournamentRecord, _o = params.status, status = _o === void 0 ? PUBLIC : _o, event = params.event, drawIdsToRemove = params.drawIdsToRemove, drawIdsToAdd = params.drawIdsToAdd, stagesToRemove = params.stagesToRemove, stagesToAdd = params.stagesToAdd, structureIdsToRemove = params.structureIdsToRemove, structureIdsToAdd = params.structureIdsToAdd;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!event)
@@ -57089,10 +57242,10 @@ function publishEvent(params) {
         policyDefinitions = appliedPolicies;
     }
     var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
-    var eventDrawIds = ((_b = event.drawDefinitions) === null || _b === void 0 ? void 0 : _b.map(function (_a) {
+    var eventDrawIds = (_c = (_b = event.drawDefinitions) === null || _b === void 0 ? void 0 : _b.map(function (_a) {
         var drawId = _a.drawId;
         return drawId;
-    })) || [];
+    })) !== null && _c !== void 0 ? _c : [];
     var timeItem = getEventTimeItem({
         itemType: itemType,
         event: event,
@@ -57102,17 +57255,17 @@ function publishEvent(params) {
         drawIds = eventDrawIds;
     }
     else if (!drawIds && ((drawIdsToAdd === null || drawIdsToAdd === void 0 ? void 0 : drawIdsToAdd.length) || (drawIdsToRemove === null || drawIdsToRemove === void 0 ? void 0 : drawIdsToRemove.length))) {
-        drawIds = ((_d = (_c = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _c === void 0 ? void 0 : _c.PUBLIC) === null || _d === void 0 ? void 0 : _d.drawIds) || [];
+        drawIds = ((_e = (_d = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _d === void 0 ? void 0 : _d.PUBLIC) === null || _e === void 0 ? void 0 : _e.drawIds) || [];
     }
-    drawIds = (drawIds || []).filter(function (drawId) { return !(drawIdsToRemove === null || drawIdsToRemove === void 0 ? void 0 : drawIdsToRemove.length) || !drawIdsToRemove.includes(drawId); });
+    drawIds = (drawIds !== null && drawIds !== void 0 ? drawIds : []).filter(function (drawId) { return !(drawIdsToRemove === null || drawIdsToRemove === void 0 ? void 0 : drawIdsToRemove.length) || !drawIdsToRemove.includes(drawId); });
     if (drawIdsToAdd === null || drawIdsToAdd === void 0 ? void 0 : drawIdsToAdd.length) {
         drawIds = unique(drawIds.concat.apply(drawIds, __spreadArray([], __read(drawIdsToAdd.filter(function (drawId) { return eventDrawIds.includes(drawId); })), false)));
     }
     if (!structureIds &&
         ((structureIdsToAdd === null || structureIdsToAdd === void 0 ? void 0 : structureIdsToAdd.length) || (structureIdsToRemove === null || structureIdsToRemove === void 0 ? void 0 : structureIdsToRemove.length))) {
-        structureIds = ((_f = (_e = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _e === void 0 ? void 0 : _e.PUBLIC) === null || _f === void 0 ? void 0 : _f.structureIds) || [];
+        structureIds = ((_g = (_f = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _f === void 0 ? void 0 : _f.PUBLIC) === null || _g === void 0 ? void 0 : _g.structureIds) || [];
     }
-    structureIds = (structureIds || []).filter(function (structureId) {
+    structureIds = (structureIds !== null && structureIds !== void 0 ? structureIds : []).filter(function (structureId) {
         return !(structureIdsToRemove === null || structureIdsToRemove === void 0 ? void 0 : structureIdsToRemove.length) ||
             !structureIdsToRemove.includes(structureId);
     });
@@ -57120,13 +57273,13 @@ function publishEvent(params) {
         structureIds = unique(structureIds.concat.apply(structureIds, __spreadArray([], __read(structureIdsToAdd), false)));
     }
     if (!stages && ((stagesToAdd === null || stagesToAdd === void 0 ? void 0 : stagesToAdd.length) || (stagesToRemove === null || stagesToRemove === void 0 ? void 0 : stagesToRemove.length))) {
-        stages = ((_h = (_g = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _g === void 0 ? void 0 : _g.PUBLIC) === null || _h === void 0 ? void 0 : _h.stages) || [];
+        stages = ((_j = (_h = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _h === void 0 ? void 0 : _h.PUBLIC) === null || _j === void 0 ? void 0 : _j.stages) || [];
     }
-    stages = (stages || []).filter(function (stage) { return !(stagesToRemove === null || stagesToRemove === void 0 ? void 0 : stagesToRemove.length) || !stagesToRemove.includes(stage); });
+    stages = (stages !== null && stages !== void 0 ? stages : []).filter(function (stage) { return !(stagesToRemove === null || stagesToRemove === void 0 ? void 0 : stagesToRemove.length) || !stagesToRemove.includes(stage); });
     if (stagesToAdd === null || stagesToAdd === void 0 ? void 0 : stagesToAdd.length) {
         stages = unique(stages.concat.apply(stages, __spreadArray([], __read(stagesToAdd), false)));
     }
-    var existingStatusValue = (_j = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _j === void 0 ? void 0 : _j[status];
+    var existingStatusValue = (_k = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _k === void 0 ? void 0 : _k[status];
     var updatedTimeItem = {
         itemValue: (_a = {},
             _a[status] = __assign(__assign({}, existingStatusValue), { drawIds: drawIds, structureIds: structureIds, stages: stages }),
@@ -57142,7 +57295,7 @@ function publishEvent(params) {
         event: event,
     }).eventData;
     // filter out drawData for unPublished draws
-    var publishState = (_l = (_k = eventData === null || eventData === void 0 ? void 0 : eventData.eventInfo) === null || _k === void 0 ? void 0 : _k.publish) === null || _l === void 0 ? void 0 : _l.state;
+    var publishState = (_m = (_l = eventData === null || eventData === void 0 ? void 0 : eventData.eventInfo) === null || _l === void 0 ? void 0 : _l.publish) === null || _m === void 0 ? void 0 : _m.state;
     eventData.drawsData = eventData.drawsData.filter(function (_a) {
         var _b;
         var drawId = _a.drawId;
@@ -58526,6 +58679,7 @@ function analyzeDraws(_a) {
         var event = eventsMap[eventId];
         var structures = (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) || [];
         var structuresData = structures.map(function (structure) {
+            var _a, _b, _c, _d;
             var stage = structure.stage, stageSequence = structure.stageSequence, structureId = structure.structureId;
             var orderNumber = stageOrder$1[stage];
             var inContextStructureMatchUps = getStructureDrawPositionProfiles({
@@ -58555,9 +58709,9 @@ function analyzeDraws(_a) {
                 var participantId = _a.participantId;
                 return participantId;
             });
-            positionsAssignedCount += (positionsAssigned === null || positionsAssigned === void 0 ? void 0 : positionsAssigned.length) || 0;
-            var unassignedPositionsCount = ((positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.length) || 0) - ((positionsAssigned === null || positionsAssigned === void 0 ? void 0 : positionsAssigned.length) || 0);
-            var _a = getRoundMatchUps$1({ matchUps: inContextStructureMatchUps }), roundMatchUps = _a.roundMatchUps, roundProfile = _a.roundProfile, roundNumbers = _a.roundNumbers, maxMatchUpsCount = _a.maxMatchUpsCount;
+            positionsAssignedCount += (_a = positionsAssigned === null || positionsAssigned === void 0 ? void 0 : positionsAssigned.length) !== null && _a !== void 0 ? _a : 0;
+            var unassignedPositionsCount = ((_b = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.length) !== null && _b !== void 0 ? _b : 0) - ((_c = positionsAssigned === null || positionsAssigned === void 0 ? void 0 : positionsAssigned.length) !== null && _c !== void 0 ? _c : 0);
+            var _e = getRoundMatchUps$1({ matchUps: inContextStructureMatchUps }), roundMatchUps = _e.roundMatchUps, roundProfile = _e.roundProfile, roundNumbers = _e.roundNumbers, maxMatchUpsCount = _e.maxMatchUpsCount;
             var activeRounds = roundProfile &&
                 Object.keys(roundProfile)
                     .filter(function (roundNumber) { return !roundProfile[roundNumber].inactiveRound; })
@@ -58569,7 +58723,7 @@ function analyzeDraws(_a) {
             var inactiveStructure = roundProfile &&
                 Object.values(roundProfile).every(function (profile) { return profile.inactiveRound; });
             return {
-                positionsAssignedCount: (positionsAssigned === null || positionsAssigned === void 0 ? void 0 : positionsAssigned.length) || 0,
+                positionsAssignedCount: (_d = positionsAssigned === null || positionsAssigned === void 0 ? void 0 : positionsAssigned.length) !== null && _d !== void 0 ? _d : 0,
                 maxWinningSideFirstRoundPosition: maxWinningSideFirstRoundPosition,
                 unassignedPositionsCount: unassignedPositionsCount,
                 inactiveStructure: inactiveStructure,
@@ -58693,7 +58847,7 @@ function setTournamentCategories(_a) {
 // bulk update when tournament dates change
 function updateCourtAvailability(_a) {
     var e_1, _b, e_2, _c;
-    var _d, _e;
+    var _d, _e, _f;
     var tournamentRecord = _a.tournamentRecord;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -58701,8 +58855,8 @@ function updateCourtAvailability(_a) {
     var tournamentDates = dateRange(startDate, endDate);
     var courts = [];
     try {
-        for (var _f = __values(tournamentRecord.venues || []), _g = _f.next(); !_g.done; _g = _f.next()) {
-            var venue = _g.value;
+        for (var _g = __values(tournamentRecord.venues || []), _h = _g.next(); !_h.done; _h = _g.next()) {
+            var venue = _h.value;
             if ((_d = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _d === void 0 ? void 0 : _d.length)
                 courts.push.apply(courts, __spreadArray([], __read(venue.courts), false));
         }
@@ -58710,12 +58864,12 @@ function updateCourtAvailability(_a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
+            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
         }
         finally { if (e_1) throw e_1.error; }
     }
     var _loop_1 = function (court) {
-        var _h = (court.dateAvailability || []).reduce(function (extents, availability) {
+        var _j = ((_e = court.dateAvailability) !== null && _e !== void 0 ? _e : []).reduce(function (extents, availability) {
             var startMinutes = timeStringMinutes(extents.startTime);
             var endMinutes = timeStringMinutes(extents.endTime);
             if (availability.startTime &&
@@ -58725,13 +58879,13 @@ function updateCourtAvailability(_a) {
                 timeStringMinutes(availability.endTime) > endMinutes)
                 extents.endTime = availability.endTime;
             return extents;
-        }, { startTime: '08:00', endTime: '18:00' }), startTime = _h.startTime, endTime = _h.endTime;
+        }, { startTime: '08:00', endTime: '18:00' }), startTime = _j.startTime, endTime = _j.endTime;
         var updatedDateAvailability = tournamentDates.map(function (date) {
             var _a;
             var existing = (_a = court.dateAvailability) === null || _a === void 0 ? void 0 : _a.find(function (availability) { return availability.date === date; });
-            return existing || { date: date, startTime: startTime, endTime: endTime };
+            return existing !== null && existing !== void 0 ? existing : { date: date, startTime: startTime, endTime: endTime };
         });
-        var defaultAvailability = (_e = court.dateAvailability) === null || _e === void 0 ? void 0 : _e.find(function (availability) { return !availability.date; });
+        var defaultAvailability = (_f = court.dateAvailability) === null || _f === void 0 ? void 0 : _f.find(function (availability) { return !availability.date; });
         if (defaultAvailability)
             updatedDateAvailability.unshift(defaultAvailability);
         court.dateAvailability = updatedDateAvailability;
@@ -58981,8 +59135,8 @@ function getMatchUpDailyLimitsUpdate(_a) {
 }
 
 function clearMatchUpSchedule(_a) {
-    var _b, _c;
-    var _d = _a.scheduleAttributes, scheduleAttributes = _d === void 0 ? [
+    var _b, _c, _d;
+    var _e = _a.scheduleAttributes, scheduleAttributes = _e === void 0 ? [
         ALLOCATE_COURTS,
         ASSIGN_COURT,
         ASSIGN_VENUE,
@@ -58992,7 +59146,7 @@ function clearMatchUpSchedule(_a) {
         END_TIME,
         RESUME_TIME,
         STOP_TIME,
-    ] : _d, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId;
+    ] : _e, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId;
     var stack = 'clearMatchUpSchedule';
     var matchUp = drawDefinition
         ? (_b = allDrawMatchUps$1({
@@ -59007,7 +59161,7 @@ function clearMatchUpSchedule(_a) {
         }).matchUps) === null || _c === void 0 ? void 0 : _c[0];
     if (!matchUp)
         return { error: MATCHUP_NOT_FOUND };
-    var newTimeItems = (matchUp.timeItems || []).filter(function (timeItem) {
+    var newTimeItems = ((_d = matchUp.timeItems) !== null && _d !== void 0 ? _d : []).filter(function (timeItem) {
         return (timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemType) && !scheduleAttributes.includes(timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemType);
     });
     matchUp.timeItems = newTimeItems;
@@ -59214,11 +59368,11 @@ function getEntryStatusReports(_a) {
                 var positionAssignments = _a.positionAssignments;
                 return positionAssignments;
             })
+                .filter(Boolean)
                 .map(function (_a) {
                 var participantId = _a.participantId;
                 return participantId;
-            })
-                .filter(Boolean);
+            });
             var entryFilter = function (_a) {
                 var participantId = _a.participantId;
                 return assignedParticipantIds.includes(participantId);
@@ -60065,8 +60219,8 @@ function assignMatchUpSideParticipant(_a) {
         };
     if (matchUp) {
         matchUp.sides = [1, 2].map(function (currentSideNumber) {
-            var _a;
-            var existingSide = ((_a = matchUp.sides) === null || _a === void 0 ? void 0 : _a.find(function (side) { return side.sideNumber === currentSideNumber; })) || { sideNumber: currentSideNumber };
+            var _a, _b;
+            var existingSide = (_b = (_a = matchUp.sides) === null || _a === void 0 ? void 0 : _a.find(function (side) { return side.sideNumber === currentSideNumber; })) !== null && _b !== void 0 ? _b : { sideNumber: currentSideNumber };
             return sideNumber === currentSideNumber
                 ? __assign(__assign({}, existingSide), { participantId: participantId }) : existingSide;
         });
@@ -60509,7 +60663,7 @@ function removeTieMatchUpParticipantId(params) {
     if (matchUpType === DOUBLES$1 &&
         participantToRemove.participantType === INDIVIDUAL) {
         var tieMatchUpSide = (_q = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _q === void 0 ? void 0 : _q.find(function (side) { return side.sideNumber === (dualMatchUpSide === null || dualMatchUpSide === void 0 ? void 0 : dualMatchUpSide.sideNumber); });
-        var pairParticipantId = (tieMatchUpSide || {}).participantId;
+        var pairParticipantId = (tieMatchUpSide !== null && tieMatchUpSide !== void 0 ? tieMatchUpSide : {}).participantId;
         var pairParticipant = pairParticipantId &&
             ((_s = (_r = getParticipants$1({
                 participantFilters: { participantIds: [pairParticipantId] },
@@ -60547,26 +60701,24 @@ function removeTieMatchUpParticipantId(params) {
                         console.log('cleanup', { result: result });
                 }
             }
-            else {
-                if (individualParticipantIds.length === 1) {
-                    var existingParticipant = getPairedParticipant({
-                        participantIds: individualParticipantIds,
+            else if (individualParticipantIds.length === 1) {
+                var existingParticipant = getPairedParticipant({
+                    participantIds: individualParticipantIds,
+                    tournamentRecord: tournamentRecord,
+                }).participant;
+                if (!existingParticipant) {
+                    var newPairParticipant = {
+                        participantRole: COMPETITOR,
+                        individualParticipantIds: individualParticipantIds,
+                        participantType: PAIR,
+                    };
+                    var result = addParticipant$1({
+                        participant: newPairParticipant,
+                        pairOverride: true,
                         tournamentRecord: tournamentRecord,
-                    }).participant;
-                    if (!existingParticipant) {
-                        var newPairParticipant = {
-                            participantRole: COMPETITOR,
-                            individualParticipantIds: individualParticipantIds,
-                            participantType: PAIR,
-                        };
-                        var result = addParticipant$1({
-                            participant: newPairParticipant,
-                            pairOverride: true,
-                            tournamentRecord: tournamentRecord,
-                        });
-                        if (result.error)
-                            return decorateResult({ result: result, stack: stack });
-                    }
+                    });
+                    if (result.error)
+                        return decorateResult({ result: result, stack: stack });
                 }
             }
         }
@@ -60634,9 +60786,9 @@ function getPositionAssignments(_a) {
         structure: structure,
     }), error = _d.error, assignments = _d.positionAssignments;
     return {
-        error: error,
-        positionAssignments: assignments || [],
+        positionAssignments: assignments !== null && assignments !== void 0 ? assignments : [],
         structureId: structure === null || structure === void 0 ? void 0 : structure.structureId,
+        error: error,
     };
 }
 
@@ -60960,14 +61112,15 @@ function assignDrawPosition(_a) {
 }
 
 function addEventEntryPairs(_a) {
-    var allowDuplicateParticipantIdPairs = _a.allowDuplicateParticipantIdPairs, _b = _a.entryStage, entryStage = _b === void 0 ? StageTypeEnum.Main : _b, _c = _a.entryStatus, entryStatus = _c === void 0 ? ALTERNATE : _c, _d = _a.participantIdPairs, participantIdPairs = _d === void 0 ? [] : _d, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, event = _a.event, uuids = _a.uuids;
+    var _b;
+    var allowDuplicateParticipantIdPairs = _a.allowDuplicateParticipantIdPairs, _c = _a.entryStage, entryStage = _c === void 0 ? StageTypeEnum.Main : _c, _d = _a.entryStatus, entryStatus = _d === void 0 ? ALTERNATE : _d, _e = _a.participantIdPairs, participantIdPairs = _e === void 0 ? [] : _e, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, event = _a.event, uuids = _a.uuids;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!event)
         return { error: MISSING_EVENT };
     if (event.eventType !== DOUBLES$1)
         return { error: INVALID_EVENT_TYPE };
-    var tournamentParticipants = tournamentRecord.participants || [];
+    var tournamentParticipants = (_b = tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
     var individualParticipantIds = tournamentParticipants
         .filter(function (participant) { return participant.participantType === INDIVIDUAL; })
         .map(function (participant) { return participant.participantId; });
@@ -60984,12 +61137,15 @@ function addEventEntryPairs(_a) {
         .filter(function (participant) { return participant.participantType === PAIR; })
         .map(function (participant) { return participant.individualParticipantIds; });
     // create provisional participant objects
-    var provisionalParticipants = participantIdPairs.map(function (individualParticipantIds) { return ({
-        participantId: (uuids === null || uuids === void 0 ? void 0 : uuids.pop()) || UUID(),
-        participantRole: COMPETITOR,
-        individualParticipantIds: individualParticipantIds,
-        participantType: PAIR,
-    }); });
+    var provisionalParticipants = participantIdPairs.map(function (individualParticipantIds) {
+        var _a;
+        return ({
+            participantId: (_a = uuids === null || uuids === void 0 ? void 0 : uuids.pop()) !== null && _a !== void 0 ? _a : UUID(),
+            participantRole: COMPETITOR,
+            individualParticipantIds: individualParticipantIds,
+            participantType: PAIR,
+        });
+    });
     // filter out existing participants unless allowDuplicateParticipantIdPairs is true
     var newParticipants = allowDuplicateParticipantIdPairs
         ? provisionalParticipants
@@ -61134,7 +61290,7 @@ function assignSeedPositions(params) {
     /**
      * mergeObject and seedLimit ensure that new assignments do not go beyond already established number of seeds
      */
-    var mergeObject = Object.assign.apply(Object, __spreadArray([{}], __read((seedAssignments || [])
+    var mergeObject = Object.assign.apply(Object, __spreadArray([{}], __read((seedAssignments !== null && seedAssignments !== void 0 ? seedAssignments : [])
         .filter(function (assignment) { return assignment.seedNumber; })
         .map(function (assignment) {
         var _a;
@@ -61403,7 +61559,7 @@ var tieFormatDefaults = function (params) {
 
 function addEvent(_a) {
     var e_1, _b;
-    var _c, _d, _e, _f;
+    var _c, _d, _e, _f, _g;
     var suppressNotifications = _a.suppressNotifications, tournamentRecord = _a.tournamentRecord, internalUse = _a.internalUse, event = _a.event;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -61426,13 +61582,7 @@ function addEvent(_a) {
             context: context,
         };
     }
-    var eventRecord = Object.assign({}, {
-        drawDefinitions: [],
-        eventType: TypeEnum.Singles,
-        entries: [],
-        startDate: startDate,
-        endDate: endDate,
-    }, event);
+    var eventRecord = __assign({ drawDefinitions: [], eventType: TypeEnum.Singles, entries: [], startDate: startDate, endDate: endDate }, event);
     if (event.eventType === TypeEnum.Team) {
         if (event.tieFormat) {
             var result = validateTieFormat({ tieFormat: event.tieFormat });
@@ -61463,7 +61613,7 @@ function addEvent(_a) {
         if (!suppressNotifications) {
             var topics = getTopics().topics;
             if (topics.includes(ADD_MATCHUPS)) {
-                var matchUps = allEventMatchUps({ event: event }).matchUps || [];
+                var matchUps = (_g = allEventMatchUps({ event: event }).matchUps) !== null && _g !== void 0 ? _g : [];
                 addMatchUpsNotice({
                     tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
                     eventId: event.eventId,
@@ -61471,15 +61621,15 @@ function addEvent(_a) {
                 });
             }
             try {
-                for (var _g = __values(event.drawDefinitions || []), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var drawDefinition = _h.value;
+                for (var _h = __values(event.drawDefinitions || []), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var drawDefinition = _j.value;
                     addDrawNotice({ drawDefinition: drawDefinition });
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                    if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -62170,11 +62320,9 @@ function setMatchUpFormat(_a) {
                     finally { if (e_2) throw e_2.error; }
                 }
             }
-            else {
-                if (event_1.matchUpFormat !== matchUpFormat) {
-                    event_1.matchUpFormat = matchUpFormat;
-                    modificationsCount += 1;
-                }
+            else if (event_1.matchUpFormat !== matchUpFormat) {
+                event_1.matchUpFormat = matchUpFormat;
+                modificationsCount += 1;
             }
         }
     }
@@ -62399,10 +62547,11 @@ function getParticipantScaleItem(_a) {
 }
 
 function getScaledEntries(_a) {
-    var _b = _a.sortDescending, sortDescending = _b === void 0 ? false : _b, tournamentRecord = _a.tournamentRecord, scaleAttributes = _a.scaleAttributes, scaleSortMethod = _a.scaleSortMethod, stageSequence = _a.stageSequence, entries = _a.entries, event = _a.event, stage = _a.stage;
+    var _b;
+    var _c = _a.sortDescending, sortDescending = _c === void 0 ? false : _c, tournamentRecord = _a.tournamentRecord, scaleAttributes = _a.scaleAttributes, scaleSortMethod = _a.scaleSortMethod, stageSequence = _a.stageSequence, entries = _a.entries, event = _a.event, stage = _a.stage;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
-    entries = entries || (event === null || event === void 0 ? void 0 : event.entries) || [];
+    entries = (_b = entries !== null && entries !== void 0 ? entries : event === null || event === void 0 ? void 0 : event.entries) !== null && _b !== void 0 ? _b : [];
     var stageEntries = entries.filter(function (entry) {
         return (!stage || !entry.entryStage || entry.entryStage === stage) &&
             (!stageSequence ||
@@ -62440,15 +62589,6 @@ function getScaledEntries(_a) {
     }
 }
 
-/**
- *
- * @param {object} tournamentRecord - passed automatically if tournamentEngine.setState()
- * @param {string} eventId - resolves to event
- * @param {string} drawId - OPTIONAL - resolves drawDefinition - scopes participants to clear to drawDefinition.entries or flightProfile.flight.drawEntries
- * @param {string} scaleName - OPTIONAL - defaults to event.categoryName || event.ageCategoryCode
- * @param {string} stage - OPTIONAL - filter event or draw entries by stage
- * @returns {boolean} { success: true } or { error }
- */
 function removeSeeding(_a) {
     var _b, _c;
     var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, entryStatuses = _a.entryStatuses, scaleName = _a.scaleName, drawId = _a.drawId, event = _a.event, stage = _a.stage;
@@ -62740,16 +62880,16 @@ var flightConstants = {
 };
 
 function generateFlightProfile(params) {
-    var _a;
-    var _b = params.drawNameRoot, drawNameRoot = _b === void 0 ? 'Flight' : _b, attachFlightProfile$1 = params.attachFlightProfile, tournamentRecord = params.tournamentRecord, scaleAttributes = params.scaleAttributes, scaleSortMethod = params.scaleSortMethod, deleteExisting = params.deleteExisting, sortDescending = params.sortDescending, _c = params.drawNames, drawNames = _c === void 0 ? [] : _c, flightsCount = params.flightsCount, splitMethod = params.splitMethod, _d = params.uuids, uuids = _d === void 0 ? [] : _d, event = params.event, stage = params.stage;
+    var _a, _b;
+    var _c = params.drawNameRoot, drawNameRoot = _c === void 0 ? 'Flight' : _c, attachFlightProfile$1 = params.attachFlightProfile, tournamentRecord = params.tournamentRecord, scaleAttributes = params.scaleAttributes, scaleSortMethod = params.scaleSortMethod, deleteExisting = params.deleteExisting, sortDescending = params.sortDescending, _d = params.drawNames, drawNames = _d === void 0 ? [] : _d, flightsCount = params.flightsCount, splitMethod = params.splitMethod, _e = params.uuids, uuids = _e === void 0 ? [] : _e, event = params.event, stage = params.stage;
     if (!event)
         return { error: MISSING_EVENT };
-    var eventEntries = event.entries || [];
+    var eventEntries = (_a = event.entries) !== null && _a !== void 0 ? _a : [];
     var flightProfile = getFlightProfile({ event: event }).flightProfile;
     if (flightProfile && attachFlightProfile$1 && !deleteExisting) {
         return { error: EXISTING_PROFILE };
     }
-    var scaledEntries = (_a = params.scaledEntries) !== null && _a !== void 0 ? _a : getScaledEntries({
+    var scaledEntries = (_b = params.scaledEntries) !== null && _b !== void 0 ? _b : getScaledEntries({
         tournamentRecord: tournamentRecord,
         scaleAttributes: scaleAttributes,
         scaleSortMethod: scaleSortMethod,
@@ -62798,10 +62938,11 @@ function generateFlightProfile(params) {
         });
     }
     var flights = generateRange(0, flightsCount).map(function (index) {
+        var _a;
         var flightNumber = index + 1;
         return {
             flightNumber: flightNumber,
-            drawId: (uuids === null || uuids === void 0 ? void 0 : uuids.pop()) || UUID(),
+            drawId: (_a = uuids === null || uuids === void 0 ? void 0 : uuids.pop()) !== null && _a !== void 0 ? _a : UUID(),
             drawEntries: getDrawEntries(splitEntries[index]),
             drawName: ((drawNames === null || drawNames === void 0 ? void 0 : drawNames.length) && drawNames[index]) ||
                 "".concat(drawNameRoot, " ").concat(flightNumber),
@@ -63087,8 +63228,8 @@ function resetDrawDefinition(_a) {
 }
 
 function pruneDrawDefinition(_a) {
-    var _b;
-    var _c = _a.matchPlayDrawPositions, matchPlayDrawPositions = _c === void 0 ? true : _c, // when simply extracting matchUps for aggregation, drawPositions are unnecessary
+    var _b, _c;
+    var _d = _a.matchPlayDrawPositions, matchPlayDrawPositions = _d === void 0 ? true : _d, // when simply extracting matchUps for aggregation, drawPositions are unnecessary
     tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, drawId = _a.drawId;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -63099,16 +63240,16 @@ function pruneDrawDefinition(_a) {
     if (drawsAnalysis.canBePruned.includes(drawId)) {
         var isMatchPlay = drawsAnalysis.matchPlay.includes(drawId);
         var drawAnalysis = drawsAnalysis.drawAnalysis[drawId];
-        var _d = __read(getDrawStructures({
+        var _e = __read(getDrawStructures({
             stageSequence: 1,
             drawDefinition: drawDefinition,
             stage: MAIN,
-        }).structures, 1), mainStructure_1 = _d[0];
+        }).structures, 1), mainStructure_1 = _e[0];
         var structureData_1 = drawAnalysis.structuresData.find(function (_a) {
             var structureId = _a.structureId;
             return mainStructure_1.structureId === structureId;
         });
-        var matchUps = mainStructure_1.matchUps || [];
+        var matchUps = (_b = mainStructure_1.matchUps) !== null && _b !== void 0 ? _b : [];
         relevantMatchUps = matchUps
             .sort(function (a, b) { return a.roundPosition - b.roundPosition; })
             .filter(function (_a) {
@@ -63135,7 +63276,7 @@ function pruneDrawDefinition(_a) {
             var matchUpIdsToDelete = relevantMatchUpIds_1.filter(function (matchUpId) { return !matchPlayMatchUpIds_1.includes(matchUpId); });
             deletedMatchUpIds.push.apply(deletedMatchUpIds, __spreadArray([], __read(matchUpIdsToDelete), false));
             var existingDrawPositionPairings = matchPlayMatchUps
-                .flatMap(function (matchUp) { return matchUp.drawPositions || []; })
+                .flatMap(function (matchUp) { var _a; return (_a = matchUp.drawPositions) !== null && _a !== void 0 ? _a : []; })
                 .filter(Boolean);
             var existingDrawPositions_1 = existingDrawPositionPairings.flat();
             var drawPositionsMap_1 = Object.assign.apply(Object, __spreadArray([{}], __read(existingDrawPositions_1.map(function (drawPosition, i) {
@@ -63153,7 +63294,7 @@ function pruneDrawDefinition(_a) {
                 }
             });
             if (matchPlayDrawPositions) {
-                var updatedPositionAssignments = (_b = mainStructure_1 === null || mainStructure_1 === void 0 ? void 0 : mainStructure_1.positionAssignments) === null || _b === void 0 ? void 0 : _b.filter(function (assignment) {
+                var updatedPositionAssignments = (_c = mainStructure_1 === null || mainStructure_1 === void 0 ? void 0 : mainStructure_1.positionAssignments) === null || _c === void 0 ? void 0 : _c.filter(function (assignment) {
                     return existingDrawPositions_1.includes(assignment.drawPosition);
                 }).map(function (assignment) {
                     assignment.drawPosition = drawPositionsMap_1[assignment.drawPosition];
@@ -63183,12 +63324,13 @@ function setOrderOfFinish(params) {
 
 function modifyEventEntries(_a) {
     var _b;
-    var _c = _a.entryStatus, entryStatus = _c === void 0 ? DIRECT_ACCEPTANCE : _c, _d = _a.unpairedParticipantIds, unpairedParticipantIds = _d === void 0 ? [] : _d, _e = _a.participantIdPairs, participantIdPairs = _e === void 0 ? [] : _e, _f = _a.entryStage, entryStage = _f === void 0 ? MAIN : _f, tournamentRecord = _a.tournamentRecord, event = _a.event;
+    var _c, _d;
+    var _e = _a.entryStatus, entryStatus = _e === void 0 ? DIRECT_ACCEPTANCE : _e, _f = _a.unpairedParticipantIds, unpairedParticipantIds = _f === void 0 ? [] : _f, _g = _a.participantIdPairs, participantIdPairs = _g === void 0 ? [] : _g, _h = _a.entryStage, entryStage = _h === void 0 ? MAIN : _h, tournamentRecord = _a.tournamentRecord, event = _a.event;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!event)
         return { error: MISSING_EVENT };
-    var tournamentParticipants = tournamentRecord.participants || [];
+    var tournamentParticipants = (_c = tournamentRecord.participants) !== null && _c !== void 0 ? _c : [];
     var individualParticipantIds = tournamentParticipants
         .filter(function (participant) { return participant.participantType === INDIVIDUAL; })
         .map(function (participant) { return participant.participantId; });
@@ -63243,7 +63385,7 @@ function modifyEventEntries(_a) {
         entryStage: entryStage,
     }); });
     // remove all entries matching the stage which has been modified
-    event.entries = (event.entries || []).filter(function (entry) { return entry.entryStage === entryStage; });
+    event.entries = ((_d = event.entries) !== null && _d !== void 0 ? _d : []).filter(function (entry) { return entry.entryStage === entryStage; });
     event.entries = (_b = event.entries).concat.apply(_b, __spreadArray(__spreadArray([], __read(pairParticipantEntries), false), __read(unpairedParticipantEntries), false));
     return __assign({}, SUCCESS);
 }
@@ -63256,8 +63398,8 @@ function drawMatic(params) {
 }
 
 function addFlight(_a) {
-    var _b, _c, _d;
-    var qualifyingPositions = _a.qualifyingPositions, _e = _a.drawEntries, drawEntries = _e === void 0 ? [] : _e, // [{ entryPosition, entryStatus, participantId }]
+    var _b, _c, _d, _e;
+    var qualifyingPositions = _a.qualifyingPositions, _f = _a.drawEntries, drawEntries = _f === void 0 ? [] : _f, // [{ entryPosition, entryStatus, participantId }]
     drawName = _a.drawName, drawId = _a.drawId, event = _a.event, stage = _a.stage;
     var stack = 'addFlight';
     if (!event)
@@ -63266,18 +63408,18 @@ function addFlight(_a) {
         return decorateResult({ result: { error: MISSING_VALUE }, stack: stack });
     if (drawEntries === null || drawEntries === void 0 ? void 0 : drawEntries.length) {
         // check that all drawEntries are in event.entries
-        var enteredParticipantIds = (event.entries || []).map(extractAttributes('participantId'));
+        var enteredParticipantIds = ((_b = event.entries) !== null && _b !== void 0 ? _b : []).map(extractAttributes('participantId'));
         var flightParticipantIds = drawEntries.map(extractAttributes('participantId'));
         if (intersection(flightParticipantIds, enteredParticipantIds).length !==
             flightParticipantIds.length) {
             return decorateResult({ result: { error: INVALID_VALUES }, stack: stack });
         }
     }
-    var flightProfile = (_b = getFlightProfile({ event: event })) === null || _b === void 0 ? void 0 : _b.flightProfile;
-    var flightNumbers = ((_d = (_c = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _c === void 0 ? void 0 : _c.map(function (_a) {
+    var flightProfile = (_c = getFlightProfile({ event: event })) === null || _c === void 0 ? void 0 : _c.flightProfile;
+    var flightNumbers = ((_e = (_d = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _d === void 0 ? void 0 : _d.map(function (_a) {
         var flightNumber = _a.flightNumber;
         return !isNaN(flightNumber) && ensureInt(flightNumber);
-    })) === null || _d === void 0 ? void 0 : _d.filter(Boolean)) || [];
+    })) === null || _e === void 0 ? void 0 : _e.filter(Boolean)) || [];
     var flightNumber = Math.max.apply(Math, __spreadArray([0], __read(flightNumbers), false)) + 1;
     var flightDrawId = drawId || UUID();
     var flight = {
@@ -64488,8 +64630,7 @@ function isValidForQualifying(_a) {
     var targetFeedProfiles = result.links.target
         .flatMap(function (t) { return t.target.feedProfile; })
         .filter(Boolean);
-    var valid = !intersection([BOTTOM_UP, TOP_DOWN, RANDOM], targetFeedProfiles)
-        .length;
+    var valid = !intersection([BOTTOM_UP, TOP_DOWN, RANDOM, WATERFALL], targetFeedProfiles).length;
     return __assign(__assign({}, SUCCESS), { valid: valid });
 }
 
@@ -64898,7 +65039,7 @@ function getMaxEntryPosition(params) {
 }
 
 function getPredictiveAccuracy(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     var matchUps = params.matchUps;
     var singlesForDoubles = params.singlesForDoubles, tournamentRecord = params.tournamentRecord, drawDefinition = params.drawDefinition, excludeMargin = params.excludeMargin, exclusionRule = params.exclusionRule, zoneDoubling = params.zoneDoubling, matchUpType = params.matchUpType, scaleName = params.scaleName, eventId = params.eventId, zonePct = params.zonePct, drawId = params.drawId, event = params.event;
     if (!tournamentRecord && !matchUps)
@@ -64914,14 +65055,14 @@ function getPredictiveAccuracy(params) {
         ? Math.abs(scaleProfile.range[0] - scaleProfile.range[1])
         : 0;
     var zoneMargin = isConvertableInteger(zonePct) && ratingsRangeDifference
-        ? (zonePct || 0 / 100) * ratingsRangeDifference
-        : params.zoneMargin || ratingsRangeDifference;
+        ? (zonePct !== null && zonePct !== void 0 ? zonePct : 0 / 100) * ratingsRangeDifference
+        : (_d = params.zoneMargin) !== null && _d !== void 0 ? _d : ratingsRangeDifference;
     var contextProfile = { withScaleValues: true, withCompetitiveness: true };
     var contextFilters = {
         matchUpTypes: matchUpType ? [matchUpType] : [SINGLES$1, DOUBLES$1],
     };
     var participants = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants;
-    if ((_d = matchUps === null || matchUps === void 0 ? void 0 : matchUps[0]) === null || _d === void 0 ? void 0 : _d.hasContext) {
+    if ((_e = matchUps === null || matchUps === void 0 ? void 0 : matchUps[0]) === null || _e === void 0 ? void 0 : _e.hasContext) {
         if (drawId) {
             matchUps = matchUps.filter(function (matchUp) { return matchUp.drawId === drawId; });
         }
@@ -64934,27 +65075,27 @@ function getPredictiveAccuracy(params) {
             (drawId && !drawDefinition && []) ||
                 (!drawId && eventId && !event && []) ||
                 (drawId &&
-                    ((_e = allDrawMatchUps$1({
+                    ((_f = allDrawMatchUps$1({
                         inContext: true,
                         drawDefinition: drawDefinition,
                         contextFilters: contextFilters,
                         contextProfile: contextProfile,
                         participants: participants,
-                    })) === null || _e === void 0 ? void 0 : _e.matchUps)) ||
+                    })) === null || _f === void 0 ? void 0 : _f.matchUps)) ||
                 (!drawId &&
                     eventId &&
-                    ((_f = allEventMatchUps({
+                    ((_g = allEventMatchUps({
                         inContext: true,
                         contextFilters: contextFilters,
                         contextProfile: contextProfile,
                         participants: participants,
                         event: event,
-                    })) === null || _f === void 0 ? void 0 : _f.matchUps)) ||
-                ((_g = allTournamentMatchUps({
+                    })) === null || _g === void 0 ? void 0 : _g.matchUps)) ||
+                ((_h = allTournamentMatchUps({
                     tournamentRecord: tournamentRecord,
                     contextFilters: contextFilters,
                     contextProfile: contextProfile,
-                })) === null || _g === void 0 ? void 0 : _g.matchUps) ||
+                })) === null || _h === void 0 ? void 0 : _h.matchUps) ||
                 [];
     }
     if (matchUpType) {
@@ -64962,7 +65103,7 @@ function getPredictiveAccuracy(params) {
     }
     var relevantMatchUps = matchUps.filter(function (_a) {
         var winningSide = _a.winningSide, score = _a.score, sides = _a.sides, matchUpStatus = _a.matchUpStatus;
-        return ![RETIRED$1, DEFAULTED, WALKOVER$2, DEAD_RUBBER, ABANDONED$1].includes(matchUpStatus || '') &&
+        return ![RETIRED$1, DEFAULTED, WALKOVER$2, DEAD_RUBBER, ABANDONED$1].includes(matchUpStatus !== null && matchUpStatus !== void 0 ? matchUpStatus : '') &&
             scoreHasValue({ score: score }) &&
             (sides === null || sides === void 0 ? void 0 : sides.length) === 2 &&
             winningSide;
@@ -66521,7 +66662,7 @@ function getAwardPoints(_a) {
 
 function getTournamentPoints(_a) {
     var e_1, _b;
-    var _c;
+    var _c, _d;
     var participantFilters = _a.participantFilters, policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, saveRankings = _a.saveRankings, level = _a.level;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -66529,25 +66670,24 @@ function getTournamentPoints(_a) {
         policyTypes: [POLICY_TYPE_RANKING_POINTS],
         tournamentRecord: tournamentRecord,
     }).policyDefinitions;
-    var pointsPolicy = (policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_RANKING_POINTS]) ||
-        (attachedPolicies === null || attachedPolicies === void 0 ? void 0 : attachedPolicies[POLICY_TYPE_RANKING_POINTS]);
+    var pointsPolicy = (_c = policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_RANKING_POINTS]) !== null && _c !== void 0 ? _c : attachedPolicies === null || attachedPolicies === void 0 ? void 0 : attachedPolicies[POLICY_TYPE_RANKING_POINTS];
     if (!pointsPolicy)
         return { error: MISSING_POLICY_DEFINITION };
     var awardProfiles = pointsPolicy.awardProfiles;
     var requireWinFirstRound = pointsPolicy.requireWinFirstRound;
     var requireWinForPoints = pointsPolicy.requireWinForPoints;
-    var _d = getParticipants$1({
+    var _e = getParticipants$1({
         withRankingProfile: true,
         participantFilters: participantFilters,
         tournamentRecord: tournamentRecord,
-    }), participants = _d.participants, derivedEventInfo = _d.derivedEventInfo, derivedDrawInfo = _d.derivedDrawInfo, mappedMatchUps = _d.mappedMatchUps;
+    }), participants = _e.participants, derivedEventInfo = _e.derivedEventInfo, derivedDrawInfo = _e.derivedDrawInfo, mappedMatchUps = _e.mappedMatchUps;
     var participantsWithOutcomes = participants === null || participants === void 0 ? void 0 : participants.filter(function (p) { var _a; return (_a = p.draws) === null || _a === void 0 ? void 0 : _a.length; });
     // keep track of points earned per person / per team
     var personPoints = {};
     var teamPoints = {};
     var pairPoints = {};
     var _loop_1 = function (participant) {
-        var e_2, _g, e_3, _h;
+        var e_2, _h, e_3, _j;
         var participantType = participant.participantType, participantId = participant.participantId, person = participant.person, draws = participant.draws;
         try {
             for (var draws_1 = (e_2 = void 0, __values(draws)), draws_1_1 = draws_1.next(); !draws_1_1.done; draws_1_1 = draws_1.next()) {
@@ -66556,7 +66696,7 @@ function getTournamentPoints(_a) {
                 var eventInfo = derivedEventInfo[eventId];
                 var drawInfo = derivedDrawInfo[drawId];
                 var drawType = drawInfo === null || drawInfo === void 0 ? void 0 : drawInfo.drawType;
-                var _j = eventInfo || {}, category = _j.category, eventType = _j.eventType;
+                var _k = eventInfo || {}, category = _k.category, eventType = _k.eventType;
                 var startDate = draw.startDate || eventInfo.startDate || tournamentRecord.startDate;
                 var endDate = draw.endDate || eventInfo.endDate || tournamentRecord.endDate;
                 // don't process INDIVIDUAL and PAIR participants in TEAM events
@@ -66567,13 +66707,12 @@ function getTournamentPoints(_a) {
                 var points = void 0;
                 if (awardProfiles) {
                     var requireWin = requireWinForPoints;
-                    // const positionAwards = []; // potential use for combining ppw w/ fpp
                     var totalWinsCount = 0;
                     var positionPoints = 0;
                     var perWinPoints = 0;
                     var rangeAccessor = void 0;
                     var _loop_2 = function (participation) {
-                        var _k, _l, e_4, _m, e_5, _o;
+                        var _l, _m, e_4, _o, e_5, _p;
                         var finishingPositionRange = participation.finishingPositionRange, participationOrder = participation.participationOrder, participantWon = participation.participantWon, flightNumber = participation.flightNumber, rankingStage = participation.rankingStage, winCount = participation.winCount;
                         totalWinsCount += winCount || 0;
                         var drawSize = drawInfo === null || drawInfo === void 0 ? void 0 : drawInfo.drawSize;
@@ -66602,27 +66741,25 @@ function getTournamentPoints(_a) {
                                 requireWin = awardProfile.requireWinForPoints;
                             if (awardProfile.requireWinFirstRound !== undefined)
                                 requireWinFirstRound = awardProfile.requireWinFirstRound;
-                            var _p = awardProfile.finishingPositionPoints, finishingPositionPoints = _p === void 0 ? {} : _p, finishingPositionRanges = awardProfile.finishingPositionRanges, finishingRound = awardProfile.finishingRound, pointsPerWin = awardProfile.pointsPerWin, flights = awardProfile.flights;
+                            var _q = awardProfile.finishingPositionPoints, finishingPositionPoints = _q === void 0 ? {} : _q, finishingPositionRanges = awardProfile.finishingPositionRanges, finishingRound = awardProfile.finishingRound, pointsPerWin = awardProfile.pointsPerWin, flights = awardProfile.flights;
                             var ppwProfile = Array.isArray(awardProfile.perWinPoints)
-                                ? (_c = awardProfile.perWinPoints) === null || _c === void 0 ? void 0 : _c.find(function (pwp) { var _a; return (_a = pwp.participationOrders) === null || _a === void 0 ? void 0 : _a.includes(participationOrder); })
+                                ? (_d = awardProfile.perWinPoints) === null || _d === void 0 ? void 0 : _d.find(function (pwp) { var _a; return (_a = pwp.participationOrders) === null || _a === void 0 ? void 0 : _a.includes(participationOrder); })
                                 : awardProfile.perWinPoints;
                             var participationOrders = finishingPositionPoints.participationOrders;
                             var awardPoints = 0;
                             var winRequired = void 0;
-                            // const noPositionAwards = !positionAwards.length;
                             var isValidOrder = !participationOrders ||
                                 participationOrders.includes(participationOrder);
                             if (isValidOrder && finishingPositionRanges && accessor) {
                                 var valueObj = finishingPositionRanges[accessor];
                                 if (valueObj) {
-                                    // positionAwards.push(accessor);
-                                    (_k = getAwardPoints({
+                                    (_l = getAwardPoints({
                                         flightNumber: flightNumber,
                                         valueObj: valueObj,
                                         drawSize: drawSize,
                                         flights: flights,
                                         level: level,
-                                    }), awardPoints = _k.awardPoints, winRequired = _k.requireWin);
+                                    }), awardPoints = _l.awardPoints, winRequired = _l.requireWin);
                                 }
                             }
                             if (!awardPoints &&
@@ -66631,15 +66768,14 @@ function getTournamentPoints(_a) {
                                 accessor) {
                                 var valueObj = finishingRound[accessor];
                                 if (valueObj) {
-                                    // positionAwards.push(accessor);
-                                    (_l = getAwardPoints({
+                                    (_m = getAwardPoints({
                                         participantWon: participantWon,
                                         flightNumber: flightNumber,
                                         valueObj: valueObj,
                                         drawSize: drawSize,
                                         flights: flights,
                                         level: level,
-                                    }), awardPoints = _l.awardPoints, winRequired = _l.requireWin);
+                                    }), awardPoints = _m.awardPoints, winRequired = _m.requireWin);
                                 }
                             }
                             if (firstRound && requireWinFirstRound !== undefined) {
@@ -66681,8 +66817,8 @@ function getTournamentPoints(_a) {
                                         continue;
                                     }
                                     try {
-                                        for (var _q = (e_5 = void 0, __values(matchUp.tieMatchUps)), _r = _q.next(); !_r.done; _r = _q.next()) {
-                                            var tieMatchUp = _r.value;
+                                        for (var _r = (e_5 = void 0, __values(matchUp.tieMatchUps)), _s = _r.next(); !_s.done; _s = _r.next()) {
+                                            var tieMatchUp = _s.value;
                                             // ingore matchUps with no winningSide
                                             if (!tieMatchUp.winningSide)
                                                 continue;
@@ -66691,7 +66827,7 @@ function getTournamentPoints(_a) {
                                     catch (e_5_1) { e_5 = { error: e_5_1 }; }
                                     finally {
                                         try {
-                                            if (_r && !_r.done && (_o = _q.return)) _o.call(_q);
+                                            if (_s && !_s.done && (_p = _r.return)) _p.call(_r);
                                         }
                                         finally { if (e_5) throw e_5.error; }
                                     }
@@ -66700,7 +66836,7 @@ function getTournamentPoints(_a) {
                             catch (e_4_1) { e_4 = { error: e_4_1 }; }
                             finally {
                                 try {
-                                    if (teamStructureMatchUps_1_1 && !teamStructureMatchUps_1_1.done && (_m = teamStructureMatchUps_1.return)) _m.call(teamStructureMatchUps_1);
+                                    if (teamStructureMatchUps_1_1 && !teamStructureMatchUps_1_1.done && (_o = teamStructureMatchUps_1.return)) _o.call(teamStructureMatchUps_1);
                                 }
                                 finally { if (e_4) throw e_4.error; }
                             }
@@ -66715,7 +66851,7 @@ function getTournamentPoints(_a) {
                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
-                            if (structureParticipation_1_1 && !structureParticipation_1_1.done && (_h = structureParticipation_1.return)) _h.call(structureParticipation_1);
+                            if (structureParticipation_1_1 && !structureParticipation_1_1.done && (_j = structureParticipation_1.return)) _j.call(structureParticipation_1);
                         }
                         finally { if (e_3) throw e_3.error; }
                     }
@@ -66752,21 +66888,21 @@ function getTournamentPoints(_a) {
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (draws_1_1 && !draws_1_1.done && (_g = draws_1.return)) _g.call(draws_1);
+                if (draws_1_1 && !draws_1_1.done && (_h = draws_1.return)) _h.call(draws_1);
             }
             finally { if (e_2) throw e_2.error; }
         }
     };
     try {
-        for (var _e = __values(participantsWithOutcomes || []), _f = _e.next(); !_f.done; _f = _e.next()) {
-            var participant = _f.value;
+        for (var _f = __values(participantsWithOutcomes !== null && participantsWithOutcomes !== void 0 ? participantsWithOutcomes : []), _g = _f.next(); !_g.done; _g = _f.next()) {
+            var participant = _g.value;
             _loop_1(participant);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+            if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
         }
         finally { if (e_1) throw e_1.error; }
     }
@@ -66899,8 +67035,8 @@ var aggregateSets = function (sets) {
 
 function generateDynamicRatings(_a) {
     var e_1, _b;
-    var _c, _d;
-    var _e = _a.removePriorValues, removePriorValues = _e === void 0 ? true : _e, tournamentRecord = _a.tournamentRecord, _f = _a.ratingType, ratingType = _f === void 0 ? ELO : _f, considerGames = _a.considerGames, matchUpIds = _a.matchUpIds, asDynamic = _a.asDynamic;
+    var _c, _d, _e;
+    var _f = _a.removePriorValues, removePriorValues = _f === void 0 ? true : _f, tournamentRecord = _a.tournamentRecord, _g = _a.ratingType, ratingType = _g === void 0 ? ELO : _g, considerGames = _a.considerGames, matchUpIds = _a.matchUpIds, asDynamic = _a.asDynamic;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!Array.isArray(matchUpIds))
@@ -66912,13 +67048,14 @@ function generateDynamicRatings(_a) {
     var ratingParameter = ratingsParameters[ratingType];
     var accessor = ratingParameter.accessor;
     var modifiedScaleValues = {};
-    var matchUps = allTournamentMatchUps({
+    var matchUps = (_c = allTournamentMatchUps({
         matchUpFilters: { matchUpIds: matchUpIds, matchUpStatuses: completedMatchUpStatuses },
         tournamentRecord: tournamentRecord,
         inContext: true,
-    }).matchUps || [];
+    }).matchUps) !== null && _c !== void 0 ? _c : [];
+    matchUps.sort(matchUpSort);
     var _loop_1 = function (matchUp) {
-        var e_2, _j, e_3, _k, _l, _m;
+        var e_2, _h, e_3, _j, _k, _l;
         var endDate = matchUp.endDate, matchUpFormat = matchUp.matchUpFormat, score = matchUp.score, sides = matchUp.sides, winningSide = matchUp.winningSide;
         var matchUpType = matchUp.matchUpType;
         var scaleAttributes = {
@@ -66932,13 +67069,14 @@ function generateDynamicRatings(_a) {
             eventType: matchUpType,
             scaleType: RATING$2,
         };
-        var sideParticipantIds = Object.assign.apply(Object, __spreadArray([{}], __read((sides || []).map(function (side) {
+        var sideParticipantIds = Object.assign.apply(Object, __spreadArray([{}], __read((sides !== null && sides !== void 0 ? sides : []).map(function (side) {
             var _a;
+            var _b;
             var sideNumber = side.sideNumber, participant = side.participant;
             return (sideNumber && (_a = {},
                 _a[sideNumber] = __spreadArray([
                     participant === null || participant === void 0 ? void 0 : participant.participantId
-                ], __read(((participant === null || participant === void 0 ? void 0 : participant.individualParticipantIds) || [])), false).filter(Boolean)
+                ], __read(((_b = participant === null || participant === void 0 ? void 0 : participant.individualParticipantIds) !== null && _b !== void 0 ? _b : [])), false).filter(Boolean)
                     .flat(),
                 _a));
         })), false));
@@ -66984,14 +67122,14 @@ function generateDynamicRatings(_a) {
         try {
             for (var winningSideParticipantIds_1 = (e_2 = void 0, __values(winningSideParticipantIds)), winningSideParticipantIds_1_1 = winningSideParticipantIds_1.next(); !winningSideParticipantIds_1_1.done; winningSideParticipantIds_1_1 = winningSideParticipantIds_1.next()) {
                 var winnerParticipantId = winningSideParticipantIds_1_1.value;
-                var winnerScaleValue = (_c = scaleItemMap[winnerParticipantId]) === null || _c === void 0 ? void 0 : _c.scaleValue;
+                var winnerScaleValue = (_d = scaleItemMap[winnerParticipantId]) === null || _d === void 0 ? void 0 : _d.scaleValue;
                 var winnerRating = typeof winnerScaleValue === 'object'
                     ? winnerScaleValue[accessor]
                     : winnerScaleValue;
                 try {
                     for (var losingSideParticipantIds_1 = (e_3 = void 0, __values(losingSideParticipantIds)), losingSideParticipantIds_1_1 = losingSideParticipantIds_1.next(); !losingSideParticipantIds_1_1.done; losingSideParticipantIds_1_1 = losingSideParticipantIds_1.next()) {
                         var loserParticipantId = losingSideParticipantIds_1_1.value;
-                        var loserScaleValue = (_d = scaleItemMap[loserParticipantId]) === null || _d === void 0 ? void 0 : _d.scaleValue;
+                        var loserScaleValue = (_e = scaleItemMap[loserParticipantId]) === null || _e === void 0 ? void 0 : _e.scaleValue;
                         var loserRating = typeof loserScaleValue === 'object'
                             ? loserScaleValue[accessor]
                             : loserScaleValue;
@@ -66999,18 +67137,18 @@ function generateDynamicRatings(_a) {
                         var loserCountables = winningSide
                             ? countables[3 - winningSide]
                             : [0, 0];
-                        var _o = calculateNewRatings({
+                        var _m = calculateNewRatings({
                             winnerCountables: winnerCountables,
                             loserCountables: loserCountables,
                             maxCountables: maxCountables,
                             winnerRating: winnerRating,
                             loserRating: loserRating,
                             ratingType: ratingType,
-                        }), newWinnerRating = _o.newWinnerRating, newLoserRating = _o.newLoserRating;
+                        }), newWinnerRating = _m.newWinnerRating, newLoserRating = _m.newLoserRating;
                         var newWinnerScaleValue = accessor
-                            ? __assign(__assign({}, winnerScaleValue), (_l = {}, _l[accessor] = newWinnerRating, _l)) : newWinnerRating;
+                            ? __assign(__assign({}, winnerScaleValue), (_k = {}, _k[accessor] = newWinnerRating, _k)) : newWinnerRating;
                         var newLoserScaleValue = accessor
-                            ? __assign(__assign({}, loserScaleValue), (_m = {}, _m[accessor] = newLoserRating, _m)) : newLoserRating;
+                            ? __assign(__assign({}, loserScaleValue), (_l = {}, _l[accessor] = newLoserRating, _l)) : newLoserRating;
                         scaleItemMap[winnerParticipantId].scaleValue = newWinnerScaleValue;
                         scaleItemMap[loserParticipantId].scaleValue = newLoserScaleValue;
                         var result = setParticipantScaleItem({
@@ -67034,7 +67172,7 @@ function generateDynamicRatings(_a) {
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (losingSideParticipantIds_1_1 && !losingSideParticipantIds_1_1.done && (_k = losingSideParticipantIds_1.return)) _k.call(losingSideParticipantIds_1);
+                        if (losingSideParticipantIds_1_1 && !losingSideParticipantIds_1_1.done && (_j = losingSideParticipantIds_1.return)) _j.call(losingSideParticipantIds_1);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
@@ -67043,15 +67181,15 @@ function generateDynamicRatings(_a) {
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (winningSideParticipantIds_1_1 && !winningSideParticipantIds_1_1.done && (_j = winningSideParticipantIds_1.return)) _j.call(winningSideParticipantIds_1);
+                if (winningSideParticipantIds_1_1 && !winningSideParticipantIds_1_1.done && (_h = winningSideParticipantIds_1.return)) _h.call(winningSideParticipantIds_1);
             }
             finally { if (e_2) throw e_2.error; }
         }
         Object.assign(modifiedScaleValues, scaleItemMap);
     };
     try {
-        for (var _g = __values(matchUps.sort(matchUpSort)), _h = _g.next(); !_h.done; _h = _g.next()) {
-            var matchUp = _h.value;
+        for (var matchUps_1 = __values(matchUps), matchUps_1_1 = matchUps_1.next(); !matchUps_1_1.done; matchUps_1_1 = matchUps_1.next()) {
+            var matchUp = matchUps_1_1.value;
             var state_1 = _loop_1(matchUp);
             if (typeof state_1 === "object")
                 return state_1.value;
@@ -67060,7 +67198,7 @@ function generateDynamicRatings(_a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+            if (matchUps_1_1 && !matchUps_1_1.done && (_b = matchUps_1.return)) _b.call(matchUps_1);
         }
         finally { if (e_1) throw e_1.error; }
     }
@@ -68770,7 +68908,7 @@ function generateParticipants(params) {
         if (ratingType && ratingsParameters$1[ratingType]) {
             // ratingAttributes allows selected attributes of ratingParameters to be overridden
             var ratingMax_1 = category.ratingMax, ratingMin_1 = category.ratingMin, ratingAttributes = category.ratingAttributes;
-            var ratingParameters = Object.assign({}, ratingsParameters$1[ratingType], ratingAttributes || {});
+            var ratingParameters = __assign(__assign({}, ratingsParameters$1[ratingType]), (ratingAttributes || {}));
             var _e = ratingParameters.attributes, attributes_1 = _e === void 0 ? {} : _e, decimalsCount_1 = ratingParameters.decimalsCount, accessors_1 = ratingParameters.accessors, range = ratingParameters.range, step_1 = ratingParameters.step;
             var getAttributes_1 = function (attributes) {
                 var e_1, _a;
@@ -69130,16 +69268,14 @@ function getParticipantsCount(_a) {
                 largestDoublesDraw = drawSize + alternatesCount;
             }
         }
-        else {
-            if (requiresUniqueParticipants) {
-                var additionalParticipantsCount = drawSize + alternatesCount;
-                if (gender)
-                    gendersCount[gender] += additionalParticipantsCount;
-                uniqueParticipantsCount += additionalParticipantsCount;
-            }
-            else if (drawSize && drawSize > largestSinglesDraw) {
-                largestSinglesDraw = drawSize + alternatesCount;
-            }
+        else if (requiresUniqueParticipants) {
+            var additionalParticipantsCount = drawSize + alternatesCount;
+            if (gender)
+                gendersCount[gender] += additionalParticipantsCount;
+            uniqueParticipantsCount += additionalParticipantsCount;
+        }
+        else if (drawSize && drawSize > largestSinglesDraw) {
+            largestSinglesDraw = drawSize + alternatesCount;
         }
     };
     /*
@@ -70028,11 +70164,12 @@ function generateEventWithDraw(params) {
 
 function generateVenues(_a) {
     var e_1, _b;
+    var _c;
     var tournamentRecord = _a.tournamentRecord, venueProfiles = _a.venueProfiles, uuids = _a.uuids;
     var startDate = tournamentRecord.startDate, endDate = tournamentRecord.endDate;
     var venueIds = [];
     var _loop_1 = function (index, venueProfile) {
-        var venueAbbreviation = venueProfile.venueAbbreviation, _f = venueProfile.venueId, venueId = _f === void 0 ? (uuids === null || uuids === void 0 ? void 0 : uuids.pop()) || UUID() : _f, dateAvailability = venueProfile.dateAvailability, _g = venueProfile.startTime, startTime = _g === void 0 ? '07:00' : _g, _h = venueProfile.endTime, endTime = _h === void 0 ? '19:00' : _h, courtTimings = venueProfile.courtTimings, courtsCount = venueProfile.courtsCount, courtNames = venueProfile.courtNames, venueName = venueProfile.venueName, idPrefix = venueProfile.idPrefix, courtIds = venueProfile.courtIds;
+        var venueAbbreviation = venueProfile.venueAbbreviation, _g = venueProfile.venueId, venueId = _g === void 0 ? (_c = uuids === null || uuids === void 0 ? void 0 : uuids.pop()) !== null && _c !== void 0 ? _c : UUID() : _g, dateAvailability = venueProfile.dateAvailability, _h = venueProfile.startTime, startTime = _h === void 0 ? '07:00' : _h, _j = venueProfile.endTime, endTime = _j === void 0 ? '19:00' : _j, courtTimings = venueProfile.courtTimings, courtsCount = venueProfile.courtsCount, courtNames = venueProfile.courtNames, venueName = venueProfile.venueName, idPrefix = venueProfile.idPrefix, courtIds = venueProfile.courtIds;
         var newVenue = {
             venueName: venueName || "Venue ".concat(index + 1),
             venueAbbreviation: venueAbbreviation,
@@ -70066,8 +70203,8 @@ function generateVenues(_a) {
             return { value: addResult };
     };
     try {
-        for (var _c = __values(venueProfiles.entries()), _d = _c.next(); !_d.done; _d = _c.next()) {
-            var _e = __read(_d.value, 2), index = _e[0], venueProfile = _e[1];
+        for (var _d = __values(venueProfiles.entries()), _e = _d.next(); !_e.done; _e = _d.next()) {
+            var _f = __read(_e.value, 2), index = _f[0], venueProfile = _f[1];
             var state_1 = _loop_1(index, venueProfile);
             if (typeof state_1 === "object")
                 return state_1.value;
@@ -70076,7 +70213,7 @@ function generateVenues(_a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+            if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
         }
         finally { if (e_1) throw e_1.error; }
     }
@@ -70307,25 +70444,26 @@ var amendsGovernor = {
 
 function generateScheduledRounds(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
+    var _e, _f;
     var schedulingProfile = _a.schedulingProfile, tournamentRecord = _a.tournamentRecord;
     if (typeof schedulingProfile !== 'object')
         return { error: INVALID_VALUES };
     var containedStructures = getContainedStructures({
         tournamentRecord: tournamentRecord,
     }).containedStructures;
-    var matchUps = allTournamentMatchUps({ tournamentRecord: tournamentRecord }).matchUps || [];
+    var matchUps = (_e = allTournamentMatchUps({ tournamentRecord: tournamentRecord }).matchUps) !== null && _e !== void 0 ? _e : [];
     var tournamentId = tournamentRecord.tournamentId;
     var scheduledRounds = [];
     try {
         for (var schedulingProfile_1 = __values(schedulingProfile), schedulingProfile_1_1 = schedulingProfile_1.next(); !schedulingProfile_1_1.done; schedulingProfile_1_1 = schedulingProfile_1.next()) {
             var dateProfile = schedulingProfile_1_1.value;
-            var scheduleDate = dateProfile.scheduleDate, _e = dateProfile.venues, venues = _e === void 0 ? [] : _e;
+            var scheduleDate = dateProfile.scheduleDate, _g = dateProfile.venues, venues = _g === void 0 ? [] : _g;
             try {
                 for (var venues_1 = (e_2 = void 0, __values(venues)), venues_1_1 = venues_1.next(); !venues_1_1.done; venues_1_1 = venues_1.next()) {
                     var venue = venues_1_1.value;
                     var rounds = venue.rounds, venueId = venue.venueId;
                     var _loop_1 = function (round) {
-                        var _f;
+                        var _h;
                         var drawId = round.drawId, winnerFinishingPositionRange = round.winnerFinishingPositionRange, roundSegment = round.roundSegment;
                         var targetMatchUps = matchUps.filter(function (matchUp) {
                             var _a;
@@ -70347,9 +70485,9 @@ function generateScheduledRounds(_a) {
                             var structureId_1 = targetMatchUp.structureId;
                             if (roundNumber && !winnerFinishingPositionRange) {
                                 structureId_1 =
-                                    Object.keys(containedStructures).find(function (containingStructureId) {
+                                    (_f = Object.keys(containedStructures).find(function (containingStructureId) {
                                         return containedStructures[containingStructureId].includes(structureId_1);
-                                    }) || structureId_1;
+                                    })) !== null && _f !== void 0 ? _f : structureId_1;
                             }
                             var roundToSchedule = {
                                 tournamentId: tournamentId,
@@ -70360,7 +70498,7 @@ function generateScheduledRounds(_a) {
                                 drawId: drawId,
                             };
                             var result = addSchedulingProfileRound({
-                                tournamentRecords: (_f = {}, _f[tournamentId] = tournamentRecord, _f),
+                                tournamentRecords: (_h = {}, _h[tournamentId] = tournamentRecord, _h),
                                 round: roundToSchedule,
                                 scheduleDate: scheduleDate,
                                 venueId: venueId,