tods-competition-factory 1.7.1 → 1.7.3

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.7.1';
+    return '1.7.3';
 }
 
 /******************************************************************************
@@ -3533,11 +3533,12 @@ function validateTieFormat(params) {
     return result;
 }
 function validateCollectionDefinition(_a) {
-    var collectionDefinition = _a.collectionDefinition, checkCollectionIds = _a.checkCollectionIds, referenceGender = _a.referenceGender, checkGender = _a.checkGender;
+    var collectionDefinition = _a.collectionDefinition, checkCollectionIds = _a.checkCollectionIds, _b = _a.checkGender, checkGender = _b === void 0 ? true : _b, referenceGender = _a.referenceGender, event = _a.event;
+    referenceGender = referenceGender !== null && referenceGender !== void 0 ? referenceGender : event === null || event === void 0 ? void 0 : event.gender;
     var errors = [];
     if (typeof collectionDefinition !== 'object') {
         errors.push("collectionDefinition must be an object: ".concat(collectionDefinition));
-        return { errors: errors };
+        return { errors: errors, error: INVALID_OBJECT };
     }
     var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionGroupNumber = collectionDefinition.collectionGroupNumber, collectionValue = collectionDefinition.collectionValue, collectionId = collectionDefinition.collectionId, matchUpCount = collectionDefinition.matchUpCount, matchUpFormat = collectionDefinition.matchUpFormat, matchUpValue = collectionDefinition.matchUpValue, matchUpType = collectionDefinition.matchUpType, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue, gender = collectionDefinition.gender;
     if (checkCollectionIds && typeof collectionId !== 'string') {
@@ -3585,7 +3586,7 @@ function validateCollectionDefinition(_a) {
         errors.push("Invalid gender: ".concat(gender));
     }
     if (errors.length)
-        return { errors: errors };
+        return { errors: errors, error: INVALID_OBJECT };
     return { valid: true };
 }
 // add collectionIds if missing
@@ -7408,7 +7409,7 @@ function getRoundMatchUps$1(_a) {
         .map(function (key) { return ensureInt(key); })
         .filter(function (f) { return !isNaN(f); });
     roundNumbers.forEach(function (roundNumber) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         var currentRoundMatchUps = roundMatchUps[roundNumber].sort(function (a, b) { return a.roundPosition - b.roundPosition; });
         var currentRoundDrawPositions = currentRoundMatchUps
             .map(function (matchUp) { return (matchUp === null || matchUp === void 0 ? void 0 : matchUp.drawPositions) || []; })
@@ -7426,7 +7427,7 @@ function getRoundMatchUps$1(_a) {
         roundProfile[roundNumber].abbreviatedRoundName =
             (_c = finishingRoundMap[roundNumber]) === null || _c === void 0 ? void 0 : _c.abbreviatedRoundName;
         roundProfile[roundNumber].finishingPositionRange =
-            roundMatchUps[roundNumber][0].finishingPositionRange;
+            (_e = (_d = roundMatchUps[roundNumber]) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.finishingPositionRange;
         if (roundNumber === 1 || !roundProfile[roundNumber - 1]) {
             var orderedDrawPositions = currentRoundDrawPositions.sort(numericSort);
             var pairedDrawPositions = chunkArray(orderedDrawPositions, 2);
@@ -23782,7 +23783,7 @@ function getExitWinningSide(_a) {
 }
 
 function assignMatchUpDrawPosition(_a) {
-    var _b, _c, _d;
+    var _b, _c, _d, _e, _f, _g, _h;
     var inContextDrawMatchUps = _a.inContextDrawMatchUps, sourceMatchUpStatus = _a.sourceMatchUpStatus, tournamentRecord = _a.tournamentRecord, sourceMatchUpId = _a.sourceMatchUpId, drawDefinition = _a.drawDefinition, matchUpStatus = _a.matchUpStatus, drawPosition = _a.drawPosition, matchUpsMap = _a.matchUpsMap, matchUpId = _a.matchUpId, event = _a.event;
     var stack = 'assignMatchUpDrawPosition';
     if (!matchUpsMap) {
@@ -23790,20 +23791,20 @@ function assignMatchUpDrawPosition(_a) {
     }
     if (!inContextDrawMatchUps) {
         inContextDrawMatchUps =
-            getAllDrawMatchUps({
+            (_b = getAllDrawMatchUps({
                 inContext: true,
                 drawDefinition: drawDefinition,
                 matchUpsMap: matchUpsMap,
-            }).matchUps || [];
+            }).matchUps) !== null && _b !== void 0 ? _b : [];
     }
     var inContextMatchUp = inContextDrawMatchUps.find(function (m) { return m.matchUpId === matchUpId; });
     var structureId = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.structureId;
-    var structure = (_b = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _b === void 0 ? void 0 : _b.find(function (structure) { return structure.structureId === structureId; });
+    var structure = (_c = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _c === void 0 ? void 0 : _c.find(function (structure) { return structure.structureId === structureId; });
     if (!structure)
         return { error: STRUCTURE_NOT_FOUND };
-    var matchUp = (_c = matchUpsMap === null || matchUpsMap === void 0 ? void 0 : matchUpsMap.drawMatchUps) === null || _c === void 0 ? void 0 : _c.find(function (matchUp) { return matchUp.matchUpId === matchUpId; });
-    var drawPositions = (matchUp === null || matchUp === void 0 ? void 0 : matchUp.drawPositions) || [];
-    var _e = getUpdatedDrawPositions({ drawPosition: drawPosition, drawPositions: drawPositions }), positionAdded = _e.positionAdded, positionAssigned = _e.positionAssigned, updatedDrawPositions = _e.updatedDrawPositions;
+    var matchUp = (_d = matchUpsMap === null || matchUpsMap === void 0 ? void 0 : matchUpsMap.drawMatchUps) === null || _d === void 0 ? void 0 : _d.find(function (matchUp) { return matchUp.matchUpId === matchUpId; });
+    var drawPositions = (_e = matchUp === null || matchUp === void 0 ? void 0 : matchUp.drawPositions) !== null && _e !== void 0 ? _e : [];
+    var _j = getUpdatedDrawPositions({ drawPosition: drawPosition, drawPositions: drawPositions }), positionAdded = _j.positionAdded, positionAssigned = _j.positionAssigned, updatedDrawPositions = _j.updatedDrawPositions;
     var positionAssignments = getPositionAssignments$1({
         drawDefinition: drawDefinition,
         structure: structure,
@@ -23829,11 +23830,11 @@ function assignMatchUpDrawPosition(_a) {
     if (matchUp && positionAdded) {
         // necessary to update inContextDrawMatchUps
         inContextDrawMatchUps =
-            getAllDrawMatchUps({
+            (_f = getAllDrawMatchUps({
                 inContext: true,
                 drawDefinition: drawDefinition,
                 matchUpsMap: matchUpsMap,
-            }).matchUps || [];
+            }).matchUps) !== null && _f !== void 0 ? _f : [];
         var exitWinningSide = (isDoubleExitExit &&
             getExitWinningSide({
                 inContextDrawMatchUps: inContextDrawMatchUps,
@@ -23870,7 +23871,7 @@ function assignMatchUpDrawPosition(_a) {
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
     });
-    var _f = targetData.targetMatchUps, winnerMatchUp = _f.winnerMatchUp, loserMatchUp = _f.loserMatchUp, loserTargetDrawPosition = _f.loserTargetDrawPosition, loserTargetLink = targetData.targetLinks.loserTargetLink;
+    var _k = targetData.targetMatchUps, winnerMatchUp = _k.winnerMatchUp, loserMatchUp = _k.loserMatchUp, loserTargetDrawPosition = _k.loserTargetDrawPosition, loserTargetLink = targetData.targetLinks.loserTargetLink;
     var structureMatchUps = getMappedStructureMatchUps({
         structureId: structure.structureId,
         matchUpsMap: matchUpsMap,
@@ -23923,9 +23924,9 @@ function assignMatchUpDrawPosition(_a) {
             var matchUpId = _a.matchUpId;
             return matchUpId === matchUp.matchUpId;
         });
-        var sides = (inContextTargetMatchUp === null || inContextTargetMatchUp === void 0 ? void 0 : inContextTargetMatchUp.sides) || [];
+        var sides = (_g = inContextTargetMatchUp === null || inContextTargetMatchUp === void 0 ? void 0 : inContextTargetMatchUp.sides) !== null && _g !== void 0 ? _g : [];
         var drawPositionSideIndex = sides.reduce(function (index, side, i) { return (side.drawPosition === drawPosition ? i : index); }, undefined);
-        var teamParticipantId = (_d = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.find(function (assignment) { return assignment.drawPosition === drawPosition; })) === null || _d === void 0 ? void 0 : _d.participantId;
+        var teamParticipantId = (_h = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.find(function (assignment) { return assignment.drawPosition === drawPosition; })) === null || _h === void 0 ? void 0 : _h.participantId;
         if (teamParticipantId && drawPositionSideIndex !== undefined) {
             updateSideLineUp({
                 inContextTargetMatchUp: inContextTargetMatchUp,
@@ -31249,10 +31250,12 @@ function getParticipantEntries(params) {
                             if (!participation)
                                 return;
                             if (!finishingPositionRange_1)
-                                finishingPositionRange_1 = participation.finishingPositionRange;
+                                finishingPositionRange_1 =
+                                    participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
                             if (diff_1(finishingPositionRange_1) >
-                                diff_1(participation.finishingPositionRange))
-                                finishingPositionRange_1 = participation.finishingPositionRange;
+                                diff_1(participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange))
+                                finishingPositionRange_1 =
+                                    participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
                             var notQualifying = participation.stage !== QUALIFYING;
                             if (notQualifying)
                                 nonQualifyingOrder_1 += 1;
@@ -31262,10 +31265,12 @@ function getParticipantEntries(params) {
                             return definedAttributes(__assign(__assign({}, participation), { participationOrder: participationOrder, flightNumber: flightNumber }));
                         })
                             .filter(Boolean);
-                        participantAggregator.draws[drawId].finishingPositionRange =
-                            finishingPositionRange_1;
-                        participantAggregator.draws[drawId].structureParticipation =
-                            orderedParticipation;
+                        if (participantAggregator.draws[drawId]) {
+                            participantAggregator.draws[drawId].finishingPositionRange =
+                                finishingPositionRange_1;
+                            participantAggregator.draws[drawId].structureParticipation =
+                                orderedParticipation;
+                        }
                     }
                 };
                 try {
@@ -32852,19 +32857,24 @@ function generateCollectionMatchUps(_a) {
     });
 }
 
-/*
- * collectionDefinition will be added to an event tieFormat (if present)
- * if a matchUpId is provided, will be added to matchUp.tieFormat
- * if a structureId is provided, will be added to structure.tieFormat
- * TODO: determine whether all contained instances of tieFormat should be updated
- */
 function addCollectionDefinition$1(_a) {
     var e_1, _b, e_2, _c, _d, e_3, _e;
-    var _f;
-    var _g = _a.updateInProgressMatchUps, updateInProgressMatchUps = _g === void 0 ? true : _g, collectionDefinition = _a.collectionDefinition, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, structureId = _a.structureId, matchUpId = _a.matchUpId, matchUp = _a.matchUp, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
-    var _h = validateCollectionDefinition({
+    var _f, _g, _h, _j, _k, _l, _m;
+    var _o = _a.updateInProgressMatchUps, updateInProgressMatchUps = _o === void 0 ? true : _o, collectionDefinition = _a.collectionDefinition, tournamentRecord = _a.tournamentRecord, referenceGender = _a.referenceGender, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, enforceGender = _a.enforceGender, structureId = _a.structureId, matchUpId = _a.matchUpId, matchUp = _a.matchUp, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
+    var appliedPolicies = (_f = getAppliedPolicies({
+        tournamentRecord: tournamentRecord,
+        drawDefinition: drawDefinition,
+        event: event,
+    }).appliedPolicies) !== null && _f !== void 0 ? _f : {};
+    enforceGender =
+        enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_h = (_g = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) === null || _g === void 0 ? void 0 : _g.participants) === null || _h === void 0 ? void 0 : _h.enforceGender;
+    var checkGender = !!(enforceGender !== false && (event === null || event === void 0 ? void 0 : event.gender));
+    var _p = validateCollectionDefinition({
         collectionDefinition: collectionDefinition,
-    }), valid = _h.valid, errors = _h.errors;
+        referenceGender: referenceGender,
+        checkGender: checkGender,
+        event: event,
+    }), valid = _p.valid, errors = _p.errors;
     if (!valid)
         return { error: INVALID_VALUES, errors: errors };
     var stack = 'addCollectionDefinition';
@@ -32880,7 +32890,7 @@ function addCollectionDefinition$1(_a) {
     if (result === null || result === void 0 ? void 0 : result.error)
         return { error: result.error };
     var structure = result === null || result === void 0 ? void 0 : result.structure;
-    matchUp = matchUp || (result === null || result === void 0 ? void 0 : result.matchUp);
+    matchUp = matchUp !== null && matchUp !== void 0 ? matchUp : result === null || result === void 0 ? void 0 : result.matchUp;
     var existingTieFormat = result === null || result === void 0 ? void 0 : result.tieFormat;
     var tieFormat = copyTieFormat(existingTieFormat);
     result = validateTieFormat({ tieFormat: tieFormat });
@@ -32908,7 +32918,7 @@ function addCollectionDefinition$1(_a) {
     });
     // calculate new winCriteria for tieFormat
     // if existing winCriteria is aggregateValue, retain
-    var _j = calculateWinCriteria(tieFormat), aggregateValue = _j.aggregateValue, valueGoal = _j.valueGoal;
+    var _q = calculateWinCriteria(tieFormat), aggregateValue = _q.aggregateValue, valueGoal = _q.valueGoal;
     tieFormat.winCriteria = definedAttributes({ aggregateValue: aggregateValue, valueGoal: valueGoal });
     // if valueGoal has changed, force renaming of the tieFormat
     var originalValueGoal = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.valueGoal;
@@ -32929,17 +32939,17 @@ function addCollectionDefinition$1(_a) {
     result = validateTieFormat({ tieFormat: prunedTieFormat });
     if (result === null || result === void 0 ? void 0 : result.error)
         return { error: result.error };
-    if (eventId) {
+    if (eventId && event) {
         event.tieFormat = prunedTieFormat;
         try {
             // all team matchUps in the event which do not have tieFormats and where draws/strucures do not have tieFormats should have matchUps added
-            for (var _k = __values(event.drawDefinitions || []), _l = _k.next(); !_l.done; _l = _k.next()) {
-                var drawDefinition_1 = _l.value;
+            for (var _r = __values((_j = event.drawDefinitions) !== null && _j !== void 0 ? _j : []), _s = _r.next(); !_s.done; _s = _r.next()) {
+                var drawDefinition_1 = _s.value;
                 if (drawDefinition_1.tieFormat)
                     continue;
                 try {
-                    for (var _m = (e_2 = void 0, __values(drawDefinition_1.structures || [])), _o = _m.next(); !_o.done; _o = _m.next()) {
-                        var structure_1 = _o.value;
+                    for (var _t = (e_2 = void 0, __values((_k = drawDefinition_1.structures) !== null && _k !== void 0 ? _k : [])), _u = _t.next(); !_u.done; _u = _t.next()) {
+                        var structure_1 = _u.value;
                         if (structure_1.tieFormat)
                             continue;
                         var result_1 = updateStructureMatchUps({
@@ -32956,7 +32966,7 @@ function addCollectionDefinition$1(_a) {
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_o && !_o.done && (_c = _m.return)) _c.call(_m);
+                        if (_u && !_u.done && (_c = _t.return)) _c.call(_t);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
@@ -32965,7 +32975,7 @@ function addCollectionDefinition$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_l && !_l.done && (_b = _k.return)) _b.call(_k);
+                if (_s && !_s.done && (_b = _r.return)) _b.call(_r);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -33025,8 +33035,8 @@ function addCollectionDefinition$1(_a) {
         // all team matchUps in the drawDefinition which do not have tieFormats and where strucures do not have tieFormats should have matchUps added
         drawDefinition.tieFormat = prunedTieFormat;
         try {
-            for (var _p = __values(drawDefinition.structures || []), _q = _p.next(); !_q.done; _q = _p.next()) {
-                var structure_2 = _q.value;
+            for (var _v = __values((_l = drawDefinition.structures) !== null && _l !== void 0 ? _l : []), _w = _v.next(); !_w.done; _w = _v.next()) {
+                var structure_2 = _w.value;
                 var result_3 = updateStructureMatchUps({
                     updateInProgressMatchUps: updateInProgressMatchUps,
                     collectionDefinition: collectionDefinition,
@@ -33041,7 +33051,7 @@ function addCollectionDefinition$1(_a) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_q && !_q.done && (_e = _p.return)) _e.call(_p);
+                if (_w && !_w.done && (_e = _v.return)) _e.call(_v);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -33057,8 +33067,7 @@ function addCollectionDefinition$1(_a) {
     else {
         return { error: MISSING_DRAW_DEFINITION };
     }
-    var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord }).appliedPolicies;
-    if ((_f = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _f === void 0 ? void 0 : _f[TIE_FORMAT_MODIFICATIONS]) {
+    if ((_m = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _m === void 0 ? void 0 : _m[TIE_FORMAT_MODIFICATIONS]) {
         var auditData = definedAttributes({
             drawId: drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.drawId,
             collectionDefinition: collectionDefinition,
@@ -47604,8 +47613,8 @@ function addPlayoffStructures$1(params) {
 
 function deleteAdHocMatchUps$1(_a) {
     var e_1, _b;
-    var _c, _d, _e;
-    var tournamentRecord = _a.tournamentRecord, _f = _a.matchUpIds, matchUpIds = _f === void 0 ? [] : _f, drawDefinition = _a.drawDefinition, structureId = _a.structureId, event = _a.event;
+    var _c, _d, _e, _f, _g;
+    var tournamentRecord = _a.tournamentRecord, _h = _a.matchUpIds, matchUpIds = _h === void 0 ? [] : _h, drawDefinition = _a.drawDefinition, structureId = _a.structureId, event = _a.event;
     if (typeof drawDefinition !== 'object')
         return { error: MISSING_DRAW_DEFINITION };
     if (typeof structureId !== 'string')
@@ -47622,8 +47631,11 @@ function deleteAdHocMatchUps$1(_a) {
         structure.finishingPosition === ROUND_OUTCOME) {
         return { error: INVALID_STRUCTURE };
     }
+    var matchUpIdsWithScoreValue = [];
     var matchUpsToDelete = (_d = existingMatchUps === null || existingMatchUps === void 0 ? void 0 : existingMatchUps.filter(function (_a) {
-        var matchUpId = _a.matchUpId;
+        var matchUpId = _a.matchUpId, score = _a.score;
+        if (scoreHasValue({ score: score }))
+            matchUpIdsWithScoreValue.push(matchUpId);
         return matchUpIds.includes(matchUpId);
     })) !== null && _d !== void 0 ? _d : [];
     var matchUpIdsToDelete = matchUpsToDelete.map(extractAttributes('matchUpId'));
@@ -47642,28 +47654,51 @@ function deleteAdHocMatchUps$1(_a) {
         var roundNumbers = unique(structure.matchUps.map(extractAttributes('roundNumber')));
         var missingRoundNumbers = getMissingSequenceNumbers(roundNumbers);
         if (missingRoundNumbers.length) {
-            var roundNumbersToConsider = missingRoundNumbers.reverse();
+            missingRoundNumbers.reverse();
             var _loop_1 = function (roundNumber) {
                 structure.matchUps.forEach(function (matchUp) {
                     if (matchUp.roundNumber && matchUp.roundNumber > roundNumber) {
                         matchUp.roundNumber -= 1;
+                        modifyMatchUpNotice({
+                            tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
+                            context: ['adHoc round deletion'],
+                            eventId: event === null || event === void 0 ? void 0 : event.eventId,
+                            drawDefinition: drawDefinition,
+                            matchUp: matchUp,
+                        });
                     }
                 });
             };
             try {
-                for (var roundNumbersToConsider_1 = __values(roundNumbersToConsider), roundNumbersToConsider_1_1 = roundNumbersToConsider_1.next(); !roundNumbersToConsider_1_1.done; roundNumbersToConsider_1_1 = roundNumbersToConsider_1.next()) {
-                    var roundNumber = roundNumbersToConsider_1_1.value;
+                for (var missingRoundNumbers_1 = __values(missingRoundNumbers), missingRoundNumbers_1_1 = missingRoundNumbers_1.next(); !missingRoundNumbers_1_1.done; missingRoundNumbers_1_1 = missingRoundNumbers_1.next()) {
+                    var roundNumber = missingRoundNumbers_1_1.value;
                     _loop_1(roundNumber);
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (roundNumbersToConsider_1_1 && !roundNumbersToConsider_1_1.done && (_b = roundNumbersToConsider_1.return)) _b.call(roundNumbersToConsider_1);
+                    if (missingRoundNumbers_1_1 && !missingRoundNumbers_1_1.done && (_b = missingRoundNumbers_1.return)) _b.call(missingRoundNumbers_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
         }
+        if (matchUpIdsWithScoreValue.length) {
+            structure.positionAssignments = unique(structure.matchUps
+                .flatMap(function (matchUp) { var _a; return ((_a = matchUp.sides) !== null && _a !== void 0 ? _a : []).map(function (side) { return side.participantId; }); })
+                .filter(Boolean)).map(function (participantId) { return ({ participantId: participantId }); });
+            var matchUpFormat = (_g = (_f = structure === null || structure === void 0 ? void 0 : structure.matchUpFormat) !== null && _f !== void 0 ? _f : drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.matchUpFormat) !== null && _g !== void 0 ? _g : event === null || event === void 0 ? void 0 : event.matchUpFormat;
+            var result = updateAssignmentParticipantResults({
+                positionAssignments: structure.positionAssignments,
+                matchUps: structure.matchUps,
+                tournamentRecord: tournamentRecord,
+                drawDefinition: drawDefinition,
+                matchUpFormat: matchUpFormat,
+                event: event,
+            });
+            if (result.error)
+                console.log(result);
+        }
         modifyDrawNotice({
             structureIds: [structureId],
             eventId: event === null || event === void 0 ? void 0 : event.eventId,
@@ -47847,24 +47882,41 @@ function removeStructure(_a) {
 }
 
 function generateAdHocMatchUps$1(_a) {
-    var _b, _c, _d, _e;
-    var participantIdPairings = _a.participantIdPairings, _f = _a.addToStructure, addToStructure = _f === void 0 ? true : _f, tournamentRecord = _a.tournamentRecord, _g = _a.matchUpIds, matchUpIds = _g === void 0 ? [] : _g, drawDefinition = _a.drawDefinition, matchUpsCount = _a.matchUpsCount, roundNumber = _a.roundNumber, structureId = _a.structureId, newRound = _a.newRound;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var participantIdPairings = _a.participantIdPairings, _k = _a.addToStructure, addToStructure = _k === void 0 ? true : _k, tournamentRecord = _a.tournamentRecord, _l = _a.matchUpIds, matchUpIds = _l === void 0 ? [] : _l, drawDefinition = _a.drawDefinition, matchUpsCount = _a.matchUpsCount, roundNumber = _a.roundNumber, structureId = _a.structureId, newRound = _a.newRound;
     if (typeof drawDefinition !== 'object')
         return { error: MISSING_DRAW_DEFINITION };
     if (!structureId && ((_b = drawDefinition.structures) === null || _b === void 0 ? void 0 : _b.length) === 1)
         structureId = (_d = (_c = drawDefinition.structures) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.structureId;
     if (typeof structureId !== 'string')
         return { error: MISSING_STRUCTURE_ID };
+    // if drawDefinition and structureId are provided it is possible to infer roundNumber
+    var structure = (_e = drawDefinition.structures) === null || _e === void 0 ? void 0 : _e.find(function (structure) { return structure.structureId === structureId; });
+    if (!structure)
+        return { error: STRUCTURE_NOT_FOUND };
+    if (!matchUpsCount) {
+        var selectedEntries = (_g = (_f = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _f === void 0 ? void 0 : _f.filter(function (entry) {
+            var entryStatus = entry.entryStatus;
+            return STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
+        })) !== null && _g !== void 0 ? _g : [];
+        var roundMatchUpsCount = Math.floor((selectedEntries === null || selectedEntries === void 0 ? void 0 : selectedEntries.length) / 2) || 1;
+        if (newRound) {
+            matchUpsCount = roundMatchUpsCount;
+        }
+        else {
+            var maxRemaining = roundMatchUpsCount - (((_h = structure.matchUps) === null || _h === void 0 ? void 0 : _h.length) || 0); // TODO: minus the number of existing matchUps in roundNumber
+            if (maxRemaining > 0)
+                matchUpsCount = maxRemaining;
+        }
+    }
     if ((participantIdPairings && !Array.isArray(participantIdPairings)) ||
         (matchUpsCount && !isConvertableInteger(matchUpsCount)) ||
         (matchUpIds && !Array.isArray(matchUpIds)) ||
         (!participantIdPairings && !matchUpsCount)) {
         return { error: INVALID_VALUES, info: 'matchUpsCount or pairings error' };
     }
-    // if drawDefinition and structureId are provided it is possible to infer roundNumber
-    var structure = (_e = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _e === void 0 ? void 0 : _e.find(function (structure) { return structure.structureId === structureId; });
     var structureHasRoundPositions;
-    var existingMatchUps = structure === null || structure === void 0 ? void 0 : structure.matchUps;
+    var existingMatchUps = (_j = structure.matchUps) !== null && _j !== void 0 ? _j : [];
     var lastRoundNumber = existingMatchUps === null || existingMatchUps === void 0 ? void 0 : existingMatchUps.reduce(function (roundNumber, matchUp) {
         if (matchUp.roundPosition)
             structureHasRoundPositions = true;
@@ -47875,14 +47927,14 @@ function generateAdHocMatchUps$1(_a) {
     // structure must not be a container of other structures
     // structure must not contain matchUps with roundPosition
     // structure must not determine finishingPosition by ROUND_OUTCOME
-    if ((structure === null || structure === void 0 ? void 0 : structure.structures) ||
+    if (structure.structures ||
         structureHasRoundPositions ||
-        (structure === null || structure === void 0 ? void 0 : structure.finishingPosition) === ROUND_OUTCOME) {
+        structure.finishingPosition === ROUND_OUTCOME) {
         return { error: INVALID_STRUCTURE };
     }
     if (roundNumber && roundNumber - 1 > (lastRoundNumber || 0))
         return { error: INVALID_VALUES, info: 'roundNumber error' };
-    var nextRoundNumber = roundNumber !== null && roundNumber !== void 0 ? roundNumber : (newRound ? (lastRoundNumber !== null && lastRoundNumber !== void 0 ? lastRoundNumber : 0) + 1 : lastRoundNumber !== null && lastRoundNumber !== void 0 ? lastRoundNumber : 1);
+    var nextRoundNumber = roundNumber !== null && roundNumber !== void 0 ? roundNumber : ((newRound && (lastRoundNumber !== null && lastRoundNumber !== void 0 ? lastRoundNumber : 0) + 1) || lastRoundNumber || 1);
     participantIdPairings =
         participantIdPairings !== null && participantIdPairings !== void 0 ? participantIdPairings : generateRange(0, matchUpsCount).map(function () { return ({
             participantIds: [undefined, undefined],
@@ -62873,6 +62925,7 @@ var eventGovernor = {
     renameStructures: renameStructures,
     disableTieAutoCalc: disableTieAutoCalc,
     enableTieAutoCalc: enableTieAutoCalc,
+    validateCollectionDefinition: validateCollectionDefinition,
     modifyCollectionDefinition: modifyCollectionDefinition$1,
     orderCollectionDefinitions: orderCollectionDefinitions$1,
     removeCollectionDefinition: removeCollectionDefinition$1,