tods-competition-factory 1.7.2 → 1.7.3

package/dist/index.mjs

@@ -333,7 +333,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.7.2";
+  return "1.7.3";
 }
 
 function getObjectTieFormat(obj) {
@@ -6183,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);
@@ -28916,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;
@@ -28929,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;
+            }
           }
         }
       }
@@ -44332,21 +44334,30 @@ function generateAdHocMatchUps$1({
     structureId = drawDefinition.structures?.[0]?.structureId;
   if (typeof structureId !== "string")
     return { error: MISSING_STRUCTURE_ID };
-  if (newRound && !matchUpsCount) {
+  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);
     }) ?? [];
-    matchUpsCount = Math.floor(selectedEntries?.length / 2) || 1;
+    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)
@@ -44355,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]
   }));