tods-competition-factory 1.8.35 → 1.8.37

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

@@ -2929,7 +2929,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.8.35';
+    return '1.8.37';
 }
 
 function getObjectTieFormat(obj) {
@@ -17454,7 +17454,7 @@ function addNationalityCode(_a) {
 function addIndividualParticipants(_a) {
     var e_1, _b, e_2, _c;
     var _d;
-    var participantMap = _a.participantMap;
+    var participantMap = _a.participantMap, template = _a.template;
     var participantObjects = Object.values(participantMap);
     try {
         for (var participantObjects_1 = __values(participantObjects), participantObjects_1_1 = participantObjects_1.next(); !participantObjects_1_1.done; participantObjects_1_1 = participantObjects_1.next()) {
@@ -17465,7 +17465,8 @@ function addIndividualParticipants(_a) {
                 try {
                     for (var _e = (e_2 = void 0, __values(participant.individualParticipantIds)), _f = _e.next(); !_f.done; _f = _e.next()) {
                         var participantId = _f.value;
-                        participant.individualParticipants.push(participantMap[participantId].participant);
+                        var source = participantMap[participantId].participant;
+                        participant.individualParticipants.push(template ? attributeFilter({ template: template, source: source }) : source);
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -17652,8 +17653,12 @@ function getParticipantMap(_a) {
         }
         finally { if (e_2) throw e_2.error; }
     }
-    if (withIndividualParticipants)
-        addIndividualParticipants({ participantMap: participantMap });
+    if (withIndividualParticipants) {
+        var template = isObject(withIndividualParticipants)
+            ? withIndividualParticipants
+            : undefined;
+        addIndividualParticipants({ participantMap: participantMap, template: template });
+    }
     return { participantMap: participantMap };
 }
 function signedIn(participant) {
@@ -17719,7 +17724,7 @@ function initializeParticipantId(_a) {
     participantMap[participantId] = {
         structureParticipation: {},
         potentialMatchUps: {},
-        scheduleConflicts: [],
+        scheduleConflicts: {},
         scheduleItems: [],
         participant: {
             groupParticipantIds: [],
@@ -29707,14 +29712,10 @@ function getParticipantEntries(params) {
     var getRelevantParticipantIds = function (participantId) {
         var _a, _b;
         var relevantParticipantIds = [participantId];
-        relevantParticipantIds.push(participantId);
         (_b = (_a = participantMap[participantId]) === null || _a === void 0 ? void 0 : _a.participant.individualParticipantIds) === null || _b === void 0 ? void 0 : _b.forEach(function (individualParticiapntId) {
             return relevantParticipantIds.push(individualParticiapntId);
         });
-        return relevantParticipantIds.some(function (obj) {
-            return !(targetParticipantIds === null || targetParticipantIds === void 0 ? void 0 : targetParticipantIds.length) ||
-                targetParticipantIds.includes(obj.relevantParticipantId);
-        })
+        return relevantParticipantIds.some(function (id) { return !(targetParticipantIds === null || targetParticipantIds === void 0 ? void 0 : targetParticipantIds.length) || targetParticipantIds.includes(id); })
             ? relevantParticipantIds
             : [];
     };
@@ -30280,10 +30281,13 @@ function getParticipantEntries(params) {
                                             timeStringMinutes(notBeforeTime);
                                 // if there is a time overlap capture both the prior matchUpId and the conflicted matchUpId
                                 if (timeOverlap && !(bothPotential && sameDraw) && itemIsPrior) {
-                                    participantAggregator.scheduleConflicts.push({
+                                    var key = [scheduleItem.matchUpId, consideredItem.matchUpId]
+                                        .sort()
+                                        .join('|');
+                                    participantAggregator.scheduleConflicts[key] = {
                                         priorScheduledMatchUpId: scheduleItem.matchUpId,
                                         matchUpIdWithConflict: consideredItem.matchUpId,
-                                    });
+                                    };
                                 }
                             }
                         }
@@ -30304,7 +30308,7 @@ function getParticipantEntries(params) {
                     finally { if (e_9) throw e_9.error; }
                 }
                 var pid = participantAggregator.participant.participantId;
-                if (participantAggregator.scheduleConflicts.length) {
+                if (Object.keys(participantAggregator.scheduleConflicts).length) {
                     participantIdsWithConflicts.push(pid);
                 }
                 participantMap[pid].scheduleConflicts =
@@ -30559,7 +30563,9 @@ function getParticipants$1(params) {
                 draw.opponents = participantOpponents.filter(function (opponent) { return opponent.drawId === draw.drawId; });
             });
         }
-        return definedAttributes(__assign(__assign({}, participant), { scheduleConflicts: scheduleAnalysis ? scheduleConflicts : undefined, draws: withDraws || withRankingProfile ? participantDraws : undefined, events: withEvents || withRankingProfile ? Object.values(events) : undefined, matchUps: withMatchUps || withRankingProfile
+        return definedAttributes(__assign(__assign({}, participant), { scheduleConflicts: scheduleAnalysis
+                ? Object.values(scheduleConflicts)
+                : undefined, draws: withDraws || withRankingProfile ? participantDraws : undefined, events: withEvents || withRankingProfile ? Object.values(events) : undefined, matchUps: withMatchUps || withRankingProfile
                 ? Object.values(matchUps)
                 : undefined, opponents: withOpponents ? participantOpponents : undefined, potentialMatchUps: nextMatchUps
                 ? Object.values(potentialMatchUps)
@@ -30589,6 +30595,9 @@ function getParticipants$1(params) {
         tournamentRecord: tournamentRecord,
     });
     if (withIndividualParticipants) {
+        var template_1 = isObject(withIndividualParticipants)
+            ? withIndividualParticipants
+            : undefined;
         try {
             for (var filteredParticipants_1 = __values(filteredParticipants), filteredParticipants_1_1 = filteredParticipants_1.next(); !filteredParticipants_1_1.done; filteredParticipants_1_1 = filteredParticipants_1.next()) {
                 var participant = filteredParticipants_1_1.value;
@@ -30597,7 +30606,8 @@ function getParticipants$1(params) {
                         var individualParticipantId = _j.value;
                         if (!participant.individualParticipants)
                             participant.individualParticipants = [];
-                        participant.individualParticipants.push(ppMap.get(individualParticipantId));
+                        var source = ppMap.get(individualParticipantId);
+                        participant.individualParticipants.push(template_1 ? attributeFilter({ template: template_1, source: source }) : source);
                     }
                 }
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -45226,6 +45236,7 @@ function generatePositioningCandidate(params) {
     };
 }
 function swapAssignedPositions(_a) {
+    var _b;
     var candidatePositionAssignments = _a.candidatePositionAssignments, swapOptions = _a.swapOptions;
     var swapOption = randomPop(swapOptions);
     if (!swapOption)
@@ -45233,11 +45244,11 @@ function swapAssignedPositions(_a) {
     var firstPosition = swapOption.drawPosition;
     var secondPosition = randomPop(swapOption.possibleDrawPositions);
     var firstAssignment = candidatePositionAssignments.find(function (assignment) { return assignment.drawPosition === firstPosition; });
-    var secondAssignment = candidatePositionAssignments.find(function (assignment) { return assignment.drawPosition === secondPosition; });
+    var secondAssignment = (_b = candidatePositionAssignments.find(function (assignment) { return assignment.drawPosition === secondPosition; })) !== null && _b !== void 0 ? _b : {};
     var updatedFirstAssignmentAttributes = {
-        participantId: secondAssignment.participantId,
-        qualifier: secondAssignment.qualifier,
-        bye: secondAssignment.bye,
+        participantId: secondAssignment === null || secondAssignment === void 0 ? void 0 : secondAssignment.participantId,
+        qualifier: secondAssignment === null || secondAssignment === void 0 ? void 0 : secondAssignment.qualifier,
+        bye: secondAssignment === null || secondAssignment === void 0 ? void 0 : secondAssignment.bye,
     };
     var updatedSecondAssignmentAttributes = {
         participantId: firstAssignment.participantId,
@@ -45383,7 +45394,7 @@ function randomUnseededSeparation(_a) {
                 if (result.error)
                     return decorateResult({ result: result, stack: stack });
             }
-            else {
+            else if (assignment.participantId) {
                 var result = assignDrawPosition$1(__assign({ automaticPlacement: true, inContextDrawMatchUps: inContextDrawMatchUps, tournamentRecord: tournamentRecord, drawDefinition: drawDefinition, seedBlockInfo: seedBlockInfo, structureId: structureId, matchUpsMap: matchUpsMap, event: event }, assignment));
                 if (result.error) {
                     return decorateResult({ result: result, stack: stack, context: { assignment: assignment } });
@@ -48135,7 +48146,9 @@ function removeStructure(_a) {
                 return link.source.structureId !== idBeingRemoved &&
                     link.target.structureId !== idBeingRemoved;
             })) || [];
-        if (!isMainStageSequence1 || idBeingRemoved !== structureId) {
+        if (!isMainStageSequence1 ||
+            (isMainStageSequence1 && qualifyingStructureIds.length) ||
+            idBeingRemoved !== structureId) {
             drawDefinition.structures = ((_c = drawDefinition.structures) !== null && _c !== void 0 ? _c : []).filter(function (structure) {
                 if (idBeingRemoved && idBeingRemoved === structure.structureId)
                     removedStructureIds.push(idBeingRemoved);
@@ -67807,6 +67820,7 @@ var lastNames = [
 	"Ampleforth",
 	"Atreides",
 	"Austen",
+	"Bach",
 	"Banks",
 	"Barrington",
 	"Batty",
@@ -67837,6 +67851,7 @@ var lastNames = [
 	"Eisenstein",
 	"Eldritch",
 	"Elliot",
+	"Escher",
 	"Eyre",
 	"Faulkner",
 	"Fukuoka",
@@ -68006,6 +68021,7 @@ var firstMale = [
 	"James",
 	"Jared",
 	"Joe",
+	"Johann",
 	"Julian",
 	"John Michael",
 	"Jonathan",
@@ -68016,6 +68032,7 @@ var firstMale = [
 	"Malachi",
 	"Mark",
 	"Masanobu",
+	"Maurits",
 	"Michael",
 	"Mustapha",
 	"Neil",