tods-competition-factory 1.7.9 → 1.7.11

package/dist/forge/generate.mjs

@@ -16595,20 +16595,20 @@ function evaluateCollectionResult({
     if (matchUp.winningSide)
       sideWins[matchUp.winningSide - 1] += 1;
   });
-  if (matchUpValue) {
+  if (isConvertableInteger(matchUpValue)) {
     collectionMatchUps.forEach((matchUp) => {
       if (matchUp.winningSide) {
         sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
       }
     });
-  } else if (setValue) {
+  } else if (isConvertableInteger(setValue)) {
     collectionMatchUps.forEach((matchUp) => {
       matchUp.score?.sets?.forEach((set) => {
         if (set.winningSide)
           sideMatchUpValues[set.winningSide - 1] += setValue;
       });
     });
-  } else if (scoreValue) {
+  } else if (isConvertableInteger(scoreValue)) {
     collectionMatchUps.forEach((matchUp) => {
       matchUp.score?.sets?.forEach((set) => {
         const {
@@ -16635,15 +16635,17 @@ function evaluateCollectionResult({
           collectionDefinition,
           collectionPosition
         });
-        sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue2;
+        if (isConvertableInteger(matchUpValue2)) {
+          sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue2;
+        }
       }
     });
   }
-  if (collectionValue) {
+  if (isConvertableInteger(collectionValue)) {
     let collectionWinningSide;
     if (winCriteria?.aggregateValue) {
       if (allCollectionMatchUpsCompleted) {
-        if ((matchUpValue || setValue || scoreValue) && sideMatchUpValues[0] !== sideMatchUpValues[1]) {
+        if (isConvertableInteger(matchUpValue || setValue || scoreValue) && sideMatchUpValues[0] !== sideMatchUpValues[1]) {
           collectionWinningSide = sideMatchUpValues[0] > sideMatchUpValues[1] ? 1 : 2;
         } else if (sideWins[0] !== sideWins[1]) {
           collectionWinningSide = sideWins[0] > sideWins[1] ? 1 : 2;
@@ -16679,7 +16681,7 @@ function evaluateCollectionResult({
   }
   if (!belongsToValueGroup) {
     sideCollectionValues.forEach(
-      (sideCollectionValue, i) => sideTieValues[i] += sideCollectionValue
+      (sideCollectionValue, i) => sideTieValues[i] += sideCollectionValue || 0
     );
   } else {
     groupValueGroups[collectionGroupNumber].sideWins[0] += sideWins[0] || 0;
@@ -16704,7 +16706,9 @@ function getGroupValueGroups({
 }) {
   const groupValueGroups = Object.assign(
     {},
-    ...collectionGroups.filter((group) => group?.groupValue && group?.groupNumber).map((group) => ({
+    ...collectionGroups.filter(
+      (group) => isConvertableInteger(group?.groupValue) && group?.groupNumber
+    ).map((group) => ({
       [group.groupNumber]: {
         ...group,
         allGroupMatchUpsCompleted: true,
@@ -16781,11 +16785,11 @@ function generateTieMatchUpScore(params) {
       }, void 0);
     }
     if (groupWinningSide) {
-      sideTieValues[groupWinningSide - 1] += groupValue;
+      sideTieValues[groupWinningSide - 1] += groupValue || 0;
     }
   }
   const sideScores = sideTieValues.map(
-    (sideTieValue, i) => sideTieValue + sideAdjustments[i]
+    (sideTieValue, i) => (sideTieValue || 0) + sideAdjustments[i]
   );
   const set = {
     side1Score: sideScores[0],
@@ -19691,6 +19695,16 @@ function generateAdHocMatchUps({
   );
   if (!structure)
     return { error: STRUCTURE_NOT_FOUND };
+  let structureHasRoundPositions;
+  const existingMatchUps = structure.matchUps ?? [];
+  const lastRoundNumber = existingMatchUps?.reduce(
+    (roundNumber2, matchUp) => {
+      if (matchUp.roundPosition)
+        structureHasRoundPositions = true;
+      return (matchUp?.roundNumber || 0) > roundNumber2 ? matchUp.roundNumber : roundNumber2;
+    },
+    0
+  );
   if (!matchUpsCount) {
     const selectedEntries = drawDefinition?.entries?.filter((entry) => {
       const entryStatus = entry.entryStatus;
@@ -19700,7 +19714,11 @@ function generateAdHocMatchUps({
     if (newRound) {
       matchUpsCount = roundMatchUpsCount;
     } else {
-      const maxRemaining = roundMatchUpsCount - (structure.matchUps?.length || 0);
+      const targetRoundNumber = roundNumber || lastRoundNumber || 1;
+      const existingRoundMatchUps = structure.matchUps?.filter(
+        (matchUp) => matchUp.roundNumber === targetRoundNumber
+      )?.length || 0;
+      const maxRemaining = roundMatchUpsCount - existingRoundMatchUps;
       if (maxRemaining > 0)
         matchUpsCount = maxRemaining;
     }
@@ -19708,16 +19726,6 @@ function generateAdHocMatchUps({
   if (participantIdPairings && !Array.isArray(participantIdPairings) || matchUpsCount && !isConvertableInteger(matchUpsCount) || matchUpIds && !Array.isArray(matchUpIds) || !participantIdPairings && !matchUpsCount) {
     return { error: INVALID_VALUES, info: "matchUpsCount or pairings error" };
   }
-  let structureHasRoundPositions;
-  const existingMatchUps = structure.matchUps ?? [];
-  const lastRoundNumber = existingMatchUps?.reduce(
-    (roundNumber2, matchUp) => {
-      if (matchUp.roundPosition)
-        structureHasRoundPositions = true;
-      return (matchUp?.roundNumber || 0) > roundNumber2 ? matchUp.roundNumber : roundNumber2;
-    },
-    0
-  );
   if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
     return { error: INVALID_STRUCTURE };
   }