tods-competition-factory 1.7.9 → 1.7.11

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.7.9';
+    return '1.7.11';
 }
 
 /******************************************************************************
@@ -5095,7 +5095,7 @@ function evaluateCollectionResult(_a) {
         if (matchUp.winningSide)
             sideWins[matchUp.winningSide - 1] += 1;
     });
-    if (matchUpValue) {
+    if (isConvertableInteger(matchUpValue)) {
         // if tiebreak set count as set value and game value
         collectionMatchUps.forEach(function (matchUp) {
             if (matchUp.winningSide) {
@@ -5103,7 +5103,7 @@ function evaluateCollectionResult(_a) {
             }
         });
     }
-    else if (setValue) {
+    else if (isConvertableInteger(setValue)) {
         collectionMatchUps.forEach(function (matchUp) {
             var _a, _b;
             (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
@@ -5112,7 +5112,7 @@ function evaluateCollectionResult(_a) {
             });
         });
     }
-    else if (scoreValue) {
+    else if (isConvertableInteger(scoreValue)) {
         collectionMatchUps.forEach(function (matchUp) {
             var _a, _b;
             (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
@@ -5141,16 +5141,18 @@ function evaluateCollectionResult(_a) {
                     collectionDefinition: collectionDefinition,
                     collectionPosition: collectionPosition,
                 });
-                sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue_1;
+                if (isConvertableInteger(matchUpValue_1)) {
+                    sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue_1;
+                }
             }
         });
     }
     // processed separately so that setValue, scoreValue and collecitonValueProfile can be used in conjunction with collectionValue
-    if (collectionValue) {
+    if (isConvertableInteger(collectionValue)) {
         var collectionWinningSide = void 0;
         if (winCriteria === null || winCriteria === void 0 ? void 0 : winCriteria.aggregateValue) {
             if (allCollectionMatchUpsCompleted) {
-                if ((matchUpValue || setValue || scoreValue) &&
+                if (isConvertableInteger(matchUpValue || setValue || scoreValue) &&
                     sideMatchUpValues[0] !== sideMatchUpValues[1]) {
                     collectionWinningSide =
                         sideMatchUpValues[0] > sideMatchUpValues[1] ? 1 : 2;
@@ -5192,7 +5194,7 @@ function evaluateCollectionResult(_a) {
         }
     }
     if (!belongsToValueGroup) {
-        sideCollectionValues.forEach(function (sideCollectionValue, i) { return (sideTieValues[i] += sideCollectionValue); });
+        sideCollectionValues.forEach(function (sideCollectionValue, i) { return (sideTieValues[i] += sideCollectionValue || 0); });
     }
     else {
         groupValueGroups[collectionGroupNumber].sideWins[0] += sideWins[0] || 0;
@@ -9830,7 +9832,9 @@ function getGroupValueGroups(_a) {
     var _b = _a.collectionGroups, collectionGroups = _b === void 0 ? [] : _b;
     // set up to handle groupValue
     var groupValueGroups = Object.assign.apply(Object, __spreadArray([{}], __read(collectionGroups
-        .filter(function (group) { return (group === null || group === void 0 ? void 0 : group.groupValue) && (group === null || group === void 0 ? void 0 : group.groupNumber); })
+        .filter(function (group) {
+        return isConvertableInteger(group === null || group === void 0 ? void 0 : group.groupValue) && (group === null || group === void 0 ? void 0 : group.groupNumber);
+    })
         .map(function (group) {
         var _a;
         return (_a = {},
@@ -9907,7 +9911,7 @@ function generateTieMatchUpScore(params) {
             }, undefined);
         }
         if (groupWinningSide) {
-            sideTieValues[groupWinningSide - 1] += groupValue;
+            sideTieValues[groupWinningSide - 1] += groupValue || 0;
         }
     };
     try {
@@ -9924,7 +9928,7 @@ function generateTieMatchUpScore(params) {
         }
         finally { if (e_2) throw e_2.error; }
     }
-    var sideScores = sideTieValues.map(function (sideTieValue, i) { return sideTieValue + sideAdjustments[i]; });
+    var sideScores = sideTieValues.map(function (sideTieValue, i) { return (sideTieValue || 0) + sideAdjustments[i]; });
     var set = {
         side1Score: sideScores[0],
         side2Score: sideScores[1],
@@ -16697,7 +16701,7 @@ function calculateWinCriteria(_a) {
             var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionGroupNumber = collectionDefinition.collectionGroupNumber, collectionValue = collectionDefinition.collectionValue, matchUpCount = collectionDefinition.matchUpCount, matchUpValue = collectionDefinition.matchUpValue, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue;
             var belongsToValueGroup = collectionGroupNumber &&
                 groupValueNumbers.includes(collectionGroupNumber);
-            if (setValue || scoreValue) {
+            if (isConvertableInteger(setValue || scoreValue)) {
                 // because setValues and scoreValues are unpredictable,
                 // any collectionDefintion that has either of these two values without a collectionValue forces the tieFormat to aggregateValue
                 aggregateValueImperative = true;
@@ -16705,7 +16709,8 @@ function calculateWinCriteria(_a) {
             else if (belongsToValueGroup) {
                 continue;
             }
-            else if (collectionValue) {
+            else if (typeof collectionValue === 'number' &&
+                isConvertableInteger(collectionValue)) {
                 valueTotal += collectionValue;
             }
             else if (collectionValueProfiles === null || collectionValueProfiles === void 0 ? void 0 : collectionValueProfiles.length) {
@@ -16723,13 +16728,10 @@ function calculateWinCriteria(_a) {
                     finally { if (e_2) throw e_2.error; }
                 }
             }
-            else if (matchUpValue) {
+            else if (typeof matchUpValue === 'number' &&
+                isConvertableInteger(matchUpValue)) {
                 valueTotal += (matchUpCount || 0) * matchUpValue;
             }
-            else {
-                // default is to give each matchUp a value of 1
-                valueTotal += matchUpCount || 0;
-            }
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -47937,8 +47939,8 @@ function removeStructure(_a) {
 }
 
 function generateAdHocMatchUps$1(_a) {
-    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;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var participantIdPairings = _a.participantIdPairings, _l = _a.addToStructure, addToStructure = _l === void 0 ? true : _l, tournamentRecord = _a.tournamentRecord, _m = _a.matchUpIds, matchUpIds = _m === void 0 ? [] : _m, 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)
@@ -47949,17 +47951,28 @@ function generateAdHocMatchUps$1(_a) {
     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 };
+    var structureHasRoundPositions;
+    var existingMatchUps = (_f = structure.matchUps) !== null && _f !== void 0 ? _f : [];
+    var lastRoundNumber = existingMatchUps === null || existingMatchUps === void 0 ? void 0 : existingMatchUps.reduce(function (roundNumber, matchUp) {
+        if (matchUp.roundPosition)
+            structureHasRoundPositions = true;
+        return ((matchUp === null || matchUp === void 0 ? void 0 : matchUp.roundNumber) || 0) > roundNumber
+            ? matchUp.roundNumber
+            : roundNumber;
+    }, 0);
     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 selectedEntries = (_h = (_g = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _g === void 0 ? void 0 : _g.filter(function (entry) {
             var entryStatus = entry.entryStatus;
             return STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
-        })) !== null && _g !== void 0 ? _g : [];
+        })) !== null && _h !== void 0 ? _h : [];
         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
+            var targetRoundNumber_1 = roundNumber || lastRoundNumber || 1;
+            var existingRoundMatchUps = ((_k = (_j = structure.matchUps) === null || _j === void 0 ? void 0 : _j.filter(function (matchUp) { return matchUp.roundNumber === targetRoundNumber_1; })) === null || _k === void 0 ? void 0 : _k.length) || 0;
+            var maxRemaining = roundMatchUpsCount - existingRoundMatchUps;
             if (maxRemaining > 0)
                 matchUpsCount = maxRemaining;
         }
@@ -47970,15 +47983,6 @@ function generateAdHocMatchUps$1(_a) {
         (!participantIdPairings && !matchUpsCount)) {
         return { error: INVALID_VALUES, info: 'matchUpsCount or pairings error' };
     }
-    var structureHasRoundPositions;
-    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;
-        return ((matchUp === null || matchUp === void 0 ? void 0 : matchUp.roundNumber) || 0) > roundNumber
-            ? matchUp.roundNumber
-            : roundNumber;
-    }, 0);
     // structure must not be a container of other structures
     // structure must not contain matchUps with roundPosition
     // structure must not determine finishingPosition by ROUND_OUTCOME
@@ -48680,11 +48684,11 @@ function setPositionAssignments$1(_a) {
     return __assign({}, SUCCESS);
 }
 
-// build up an array of participantIds which are assigned positions in structures
-// optionally filter to included only specified stages
 function getAssignedParticipantIds(_a) {
     var drawDefinition = _a.drawDefinition, stages = _a.stages;
-    var stageStructures = ((drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) || []).filter(function (structure) { return !(stages === null || stages === void 0 ? void 0 : stages.length) || stages.includes(structure.stage); });
+    var stageStructures = ((drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) || []).filter(function (structure) {
+        return !(stages === null || stages === void 0 ? void 0 : stages.length) || (structure.stage && stages.includes(structure.stage));
+    });
     return stageStructures
         .map(function (structure) {
         var positionAssignments = getPositionAssignments$1({
@@ -49279,45 +49283,56 @@ function participantInFlightEntries(_a) {
 }
 
 function removeEventEntries(_a) {
-    var _b, _c;
-    var _d = _a.autoEntryPositions, autoEntryPositions = _d === void 0 ? true : _d, tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, event = _a.event;
+    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 stack = 'removeEventEntries';
     if (!(event === null || event === void 0 ? void 0 : event.eventId))
         return { error: MISSING_EVENT };
-    if (!Array.isArray(participantIds))
-        return decorateResult({
-            result: { error: MISSING_PARTICIPANT_IDS },
-            stack: stack,
-        });
-    participantIds = participantIds === null || participantIds === void 0 ? void 0 : participantIds.filter(Boolean);
-    if (!(participantIds === null || participantIds === void 0 ? void 0 : participantIds.length))
-        return decorateResult({
-            result: { error: MISSING_PARTICIPANT_IDS },
-            stack: stack,
-        });
-    var eventId = event.eventId;
-    if (!tournamentParticipants) {
-        // cannot use getParticipants() because event objects don't have drawIds array
-        tournamentParticipants = getTournamentParticipants({
-            participantFilters: { participantIds: participantIds },
-            tournamentRecord: tournamentRecord,
-            withEvents: true,
-            withDraws: true,
-        }).tournamentParticipants;
+    if (!Array.isArray(participantIds) ||
+        participantIds.some(function (participantId) { return !isString(participantId); })) {
+        return decorateResult({ result: { error: INVALID_PARTICIPANT_ID }, stack: stack });
     }
-    var enteredParticipantIds = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.every(function (participant) {
-        var eventObject = participant.events.find(function (event) { return event.eventId === eventId; });
-        var drawIds = (eventObject === null || eventObject === void 0 ? void 0 : eventObject.drawIds) || [];
-        return participant.draws.filter(function (drawInfo) {
-            return drawIds.includes(drawInfo.drawId) && drawInfo.positionAssignments;
-        }).length;
-    });
-    if (enteredParticipantIds) {
+    // do not filter by stages; must kmow all participantIds assigned to any stage!
+    var assignedParticipantIds = ((_b = event.drawDefinitions) !== null && _b !== void 0 ? _b : []).flatMap(function (drawDefinition) { return getAssignedParticipantIds({ drawDefinition: drawDefinition }); });
+    var statusParticipantIds = (((entryStatuses === null || entryStatuses === void 0 ? void 0 : entryStatuses.length) &&
+        ((_c = event.entries) === null || _c === void 0 ? void 0 : _c.filter(function (entry) {
+            return entry.entryStatus && entryStatuses.includes(entry.entryStatus);
+        }))) ||
+        [])
+        .map(extractAttributes('participantId'))
+        .filter(function (participantId) { return !assignedParticipantIds.includes(participantId); });
+    var stageParticipantIds = ((stage &&
+        ((_d = event.entries) === null || _d === void 0 ? void 0 : _d.filter(function (entry) { return entry.entryStage && entry.entryStage === stage; }))) ||
+        [])
+        .map(extractAttributes('participantId'))
+        .filter(function (participantId) { return !assignedParticipantIds.includes(participantId); });
+    if (participantIds.length) {
+        participantIds = participantIds.filter(function (participantId) {
+            return (!(entryStatuses === null || entryStatuses === void 0 ? void 0 : entryStatuses.length) ||
+                statusParticipantIds.includes(participantId)) &&
+                (!stage || stageParticipantIds.includes(participantId));
+        });
+    }
+    else if (statusParticipantIds.length && stageParticipantIds.length) {
+        participantIds = intersection(statusParticipantIds, stageParticipantIds);
+    }
+    else if (statusParticipantIds.length) {
+        participantIds = statusParticipantIds;
+    }
+    else if (stageParticipantIds.length) {
+        participantIds = stageParticipantIds;
+    }
+    if ((participantIds === null || participantIds === void 0 ? void 0 : participantIds.length) &&
+        assignedParticipantIds.some(function (participantId) {
+            return participantIds.includes(participantId);
+        })) {
         return decorateResult({
             result: { error: EXISTING_PARTICIPANT_DRAW_POSITION_ASSIGNMENT },
             stack: stack,
         });
     }
+    if (!(participantIds === null || participantIds === void 0 ? void 0 : participantIds.length))
+        return __assign(__assign({}, SUCCESS), { participantIdsRemoved: [] });
     var participantIdsRemoved = [];
     event.entries = (event.entries || []).filter(function (entry) {
         var keepEntry = !participantIds.includes(entry === null || entry === void 0 ? void 0 : entry.participantId);
@@ -49332,10 +49347,10 @@ function removeEventEntries(_a) {
     }
     // also remove entry from all flights and drawDefinitions
     var flightProfile = getFlightProfile({ event: event }).flightProfile;
-    (_b = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _b === void 0 ? void 0 : _b.forEach(function (flight) {
+    (_e = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _e === void 0 ? void 0 : _e.forEach(function (flight) {
         flight.drawEntries = (flight.drawEntries || []).filter(function (entry) { return !participantIds.includes(entry.participantId); });
     });
-    (_c = event.drawDefinitions) === null || _c === void 0 ? void 0 : _c.forEach(function (drawDefinition) {
+    (_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); });
     });
     return __assign(__assign({}, SUCCESS), { participantIdsRemoved: participantIdsRemoved });
@@ -49492,7 +49507,6 @@ function addEventEntries(params) {
             removeEventEntries({
                 participantIds: ungroupedParticipantIdsToRemove,
                 autoEntryPositions: false,
-                tournamentRecord: tournamentRecord,
                 event: event,
             });
         }
@@ -49828,8 +49842,6 @@ function deleteParticipants(params) {
         for (var _f = __values(tournamentRecord.events || []), _g = _f.next(); !_g.done; _g = _f.next()) {
             var event_1 = _g.value;
             var result = removeEventEntries({
-                tournamentParticipants: tournamentParticipants,
-                tournamentRecord: tournamentRecord,
                 participantIds: participantIds,
                 event: event_1,
             });
@@ -50010,7 +50022,6 @@ function destroyGroupEntry(_a) {
     // remove the group participant from event entries
     var result = removeEventEntries({
         participantIds: [participantId],
-        tournamentRecord: tournamentRecord,
         event: event,
     });
     if (result.error)