tods-competition-factory 1.7.1 → 1.7.3

package/dist/index.mjs

@@ -333,7 +333,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.7.1";
+  return "1.7.3";
 }
 
 function getObjectTieFormat(obj) {
@@ -2578,15 +2578,17 @@ function validateTieFormat(params) {
 function validateCollectionDefinition({
   collectionDefinition,
   checkCollectionIds,
+  checkGender = true,
   referenceGender,
-  checkGender
+  event
 }) {
+  referenceGender = referenceGender ?? event?.gender;
   const errors = [];
   if (typeof collectionDefinition !== "object") {
     errors.push(
       `collectionDefinition must be an object: ${collectionDefinition}`
     );
-    return { errors };
+    return { errors, error: INVALID_OBJECT };
   }
   const {
     collectionValueProfiles,
@@ -2645,7 +2647,7 @@ function validateCollectionDefinition({
     errors.push(`Invalid gender: ${gender}`);
   }
   if (errors.length)
-    return { errors };
+    return { errors, error: INVALID_OBJECT };
   return { valid: true };
 }
 function checkTieFormat(tieFormat) {
@@ -6181,7 +6183,7 @@ function getRoundMatchUps$1({
     roundProfile[roundNumber].finishingRound = finishingRoundMap[roundNumber]?.finishingRound;
     roundProfile[roundNumber].roundName = finishingRoundMap[roundNumber]?.roundName;
     roundProfile[roundNumber].abbreviatedRoundName = finishingRoundMap[roundNumber]?.abbreviatedRoundName;
-    roundProfile[roundNumber].finishingPositionRange = roundMatchUps[roundNumber][0].finishingPositionRange;
+    roundProfile[roundNumber].finishingPositionRange = roundMatchUps[roundNumber]?.[0]?.finishingPositionRange;
     if (roundNumber === 1 || !roundProfile[roundNumber - 1]) {
       const orderedDrawPositions = currentRoundDrawPositions.sort(numericSort);
       const pairedDrawPositions = chunkArray(orderedDrawPositions, 2);
@@ -21760,7 +21762,7 @@ function assignMatchUpDrawPosition({
       inContext: true,
       drawDefinition,
       matchUpsMap
-    }).matchUps || [];
+    }).matchUps ?? [];
   }
   const inContextMatchUp = inContextDrawMatchUps.find(
     (m) => m.matchUpId === matchUpId
@@ -21774,7 +21776,7 @@ function assignMatchUpDrawPosition({
   const matchUp = matchUpsMap?.drawMatchUps?.find(
     (matchUp2) => matchUp2.matchUpId === matchUpId
   );
-  const drawPositions = matchUp?.drawPositions || [];
+  const drawPositions = matchUp?.drawPositions ?? [];
   const { positionAdded, positionAssigned, updatedDrawPositions } = getUpdatedDrawPositions({ drawPosition, drawPositions });
   const { positionAssignments } = getPositionAssignments$1({
     drawDefinition,
@@ -21791,7 +21793,7 @@ function assignMatchUpDrawPosition({
       inContext: true,
       drawDefinition,
       matchUpsMap
-    }).matchUps || [];
+    }).matchUps ?? [];
     const exitWinningSide = isDoubleExitExit && getExitWinningSide({
       inContextDrawMatchUps,
       drawPosition,
@@ -21879,7 +21881,7 @@ function assignMatchUpDrawPosition({
     const inContextTargetMatchUp = inContextDrawMatchUps?.find(
       ({ matchUpId: matchUpId2 }) => matchUpId2 === matchUp.matchUpId
     );
-    const sides = inContextTargetMatchUp?.sides || [];
+    const sides = inContextTargetMatchUp?.sides ?? [];
     const drawPositionSideIndex = sides.reduce(
       (index, side, i) => side.drawPosition === drawPosition ? i : index,
       void 0
@@ -28914,9 +28916,9 @@ function getParticipantEntries(params) {
               if (!participation)
                 return;
               if (!finishingPositionRange)
-                finishingPositionRange = participation.finishingPositionRange;
-              if (diff(finishingPositionRange) > diff(participation.finishingPositionRange))
-                finishingPositionRange = participation.finishingPositionRange;
+                finishingPositionRange = participation?.finishingPositionRange;
+              if (diff(finishingPositionRange) > diff(participation?.finishingPositionRange))
+                finishingPositionRange = participation?.finishingPositionRange;
               const notQualifying = participation.stage !== QUALIFYING;
               if (notQualifying)
                 nonQualifyingOrder += 1;
@@ -28927,8 +28929,10 @@ function getParticipantEntries(params) {
                 flightNumber
               });
             }).filter(Boolean);
-            participantAggregator.draws[drawId].finishingPositionRange = finishingPositionRange;
-            participantAggregator.draws[drawId].structureParticipation = orderedParticipation;
+            if (participantAggregator.draws[drawId]) {
+              participantAggregator.draws[drawId].finishingPositionRange = finishingPositionRange;
+              participantAggregator.draws[drawId].structureParticipation = orderedParticipation;
+            }
           }
         }
       }
@@ -30333,8 +30337,10 @@ function addCollectionDefinition$1({
   updateInProgressMatchUps = true,
   collectionDefinition,
   tournamentRecord,
+  referenceGender,
   drawDefinition,
   tieFormatName,
+  enforceGender,
   structureId,
   matchUpId,
   matchUp,
@@ -30342,8 +30348,18 @@ function addCollectionDefinition$1({
   uuids,
   event
 }) {
+  const appliedPolicies = getAppliedPolicies({
+    tournamentRecord,
+    drawDefinition,
+    event
+  }).appliedPolicies ?? {};
+  enforceGender = enforceGender ?? appliedPolicies?.[POLICY_TYPE_MATCHUP_ACTIONS]?.participants?.enforceGender;
+  const checkGender = !!(enforceGender !== false && event?.gender);
   const { valid, errors } = validateCollectionDefinition({
-    collectionDefinition
+    collectionDefinition,
+    referenceGender,
+    checkGender,
+    event
   });
   if (!valid)
     return { error: INVALID_VALUES, errors };
@@ -30358,7 +30374,7 @@ function addCollectionDefinition$1({
   if (result?.error)
     return { error: result.error };
   const structure = result?.structure;
-  matchUp = matchUp || result?.matchUp;
+  matchUp = matchUp ?? result?.matchUp;
   const existingTieFormat = result?.tieFormat;
   const tieFormat = copyTieFormat(existingTieFormat);
   result = validateTieFormat({ tieFormat });
@@ -30398,12 +30414,12 @@ function addCollectionDefinition$1({
   result = validateTieFormat({ tieFormat: prunedTieFormat });
   if (result?.error)
     return { error: result.error };
-  if (eventId) {
+  if (eventId && event) {
     event.tieFormat = prunedTieFormat;
-    for (const drawDefinition2 of event.drawDefinitions || []) {
+    for (const drawDefinition2 of event.drawDefinitions ?? []) {
       if (drawDefinition2.tieFormat)
         continue;
-      for (const structure2 of drawDefinition2.structures || []) {
+      for (const structure2 of drawDefinition2.structures ?? []) {
         if (structure2.tieFormat)
           continue;
         const result2 = updateStructureMatchUps({
@@ -30468,7 +30484,7 @@ function addCollectionDefinition$1({
     });
   } else if (drawDefinition) {
     drawDefinition.tieFormat = prunedTieFormat;
-    for (const structure2 of drawDefinition.structures || []) {
+    for (const structure2 of drawDefinition.structures ?? []) {
       const result2 = updateStructureMatchUps({
         updateInProgressMatchUps,
         collectionDefinition,
@@ -30490,7 +30506,6 @@ function addCollectionDefinition$1({
   } else {
     return { error: MISSING_DRAW_DEFINITION };
   }
-  const { appliedPolicies } = getAppliedPolicies({ tournamentRecord });
   if (appliedPolicies?.audit?.[TIE_FORMAT_MODIFICATIONS]) {
     const auditData = definedAttributes({
       drawId: drawDefinition?.drawId,
@@ -44091,9 +44106,12 @@ function deleteAdHocMatchUps$1({
   if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
     return { error: INVALID_STRUCTURE };
   }
-  const matchUpsToDelete = existingMatchUps?.filter(
-    ({ matchUpId }) => matchUpIds.includes(matchUpId)
-  ) ?? [];
+  const matchUpIdsWithScoreValue = [];
+  const matchUpsToDelete = existingMatchUps?.filter(({ matchUpId, score }) => {
+    if (scoreHasValue({ score }))
+      matchUpIdsWithScoreValue.push(matchUpId);
+    return matchUpIds.includes(matchUpId);
+  }) ?? [];
   const matchUpIdsToDelete = matchUpsToDelete.map(
     extractAttributes("matchUpId")
   );
@@ -44113,15 +44131,40 @@ function deleteAdHocMatchUps$1({
     );
     const missingRoundNumbers = getMissingSequenceNumbers(roundNumbers);
     if (missingRoundNumbers.length) {
-      const roundNumbersToConsider = missingRoundNumbers.reverse();
-      for (const roundNumber of roundNumbersToConsider) {
+      missingRoundNumbers.reverse();
+      for (const roundNumber of missingRoundNumbers) {
         structure.matchUps.forEach((matchUp) => {
           if (matchUp.roundNumber && matchUp.roundNumber > roundNumber) {
             matchUp.roundNumber -= 1;
+            modifyMatchUpNotice({
+              tournamentId: tournamentRecord?.tournamentId,
+              context: ["adHoc round deletion"],
+              eventId: event?.eventId,
+              drawDefinition,
+              matchUp
+            });
           }
         });
       }
     }
+    if (matchUpIdsWithScoreValue.length) {
+      structure.positionAssignments = unique(
+        structure.matchUps.flatMap(
+          (matchUp) => (matchUp.sides ?? []).map((side) => side.participantId)
+        ).filter(Boolean)
+      ).map((participantId) => ({ participantId }));
+      const matchUpFormat = structure?.matchUpFormat ?? drawDefinition?.matchUpFormat ?? event?.matchUpFormat;
+      const result = updateAssignmentParticipantResults({
+        positionAssignments: structure.positionAssignments,
+        matchUps: structure.matchUps,
+        tournamentRecord,
+        drawDefinition,
+        matchUpFormat,
+        event
+      });
+      if (result.error)
+        console.log(result);
+    }
     modifyDrawNotice({
       structureIds: [structureId],
       eventId: event?.eventId,
@@ -44291,14 +44334,30 @@ function generateAdHocMatchUps$1({
     structureId = drawDefinition.structures?.[0]?.structureId;
   if (typeof structureId !== "string")
     return { error: MISSING_STRUCTURE_ID };
+  const structure = drawDefinition.structures?.find(
+    (structure2) => structure2.structureId === structureId
+  );
+  if (!structure)
+    return { error: STRUCTURE_NOT_FOUND };
+  if (!matchUpsCount) {
+    const selectedEntries = drawDefinition?.entries?.filter((entry) => {
+      const entryStatus = entry.entryStatus;
+      return STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
+    }) ?? [];
+    const roundMatchUpsCount = Math.floor(selectedEntries?.length / 2) || 1;
+    if (newRound) {
+      matchUpsCount = roundMatchUpsCount;
+    } else {
+      const maxRemaining = roundMatchUpsCount - (structure.matchUps?.length || 0);
+      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" };
   }
-  const structure = drawDefinition?.structures?.find(
-    (structure2) => structure2.structureId === structureId
-  );
   let structureHasRoundPositions;
-  const existingMatchUps = structure?.matchUps;
+  const existingMatchUps = structure.matchUps ?? [];
   const lastRoundNumber = existingMatchUps?.reduce(
     (roundNumber2, matchUp) => {
       if (matchUp.roundPosition)
@@ -44307,12 +44366,12 @@ function generateAdHocMatchUps$1({
     },
     0
   );
-  if (structure?.structures || structureHasRoundPositions || structure?.finishingPosition === ROUND_OUTCOME) {
+  if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
     return { error: INVALID_STRUCTURE };
   }
   if (roundNumber && roundNumber - 1 > (lastRoundNumber || 0))
     return { error: INVALID_VALUES, info: "roundNumber error" };
-  const nextRoundNumber = roundNumber ?? (newRound ? (lastRoundNumber ?? 0) + 1 : lastRoundNumber ?? 1);
+  const nextRoundNumber = roundNumber ?? (newRound && (lastRoundNumber ?? 0) + 1 || lastRoundNumber || 1);
   participantIdPairings = participantIdPairings ?? generateRange(0, matchUpsCount).map(() => ({
     participantIds: [void 0, void 0]
   }));
@@ -57939,6 +57998,7 @@ const eventGovernor = {
   renameStructures,
   disableTieAutoCalc,
   enableTieAutoCalc,
+  validateCollectionDefinition,
   modifyCollectionDefinition: modifyCollectionDefinition$1,
   orderCollectionDefinitions: orderCollectionDefinitions$1,
   removeCollectionDefinition: removeCollectionDefinition$1,