tods-competition-factory 1.7.9 → 1.7.10

package/dist/index.mjs

@@ -333,7 +333,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.7.9";
+  return "1.7.10";
 }
 
 function getObjectTieFormat(obj) {
@@ -3972,20 +3972,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 {
@@ -4012,15 +4012,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;
@@ -4056,7 +4058,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;
@@ -8372,7 +8374,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,
@@ -8449,11 +8453,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],
@@ -15120,20 +15124,18 @@ function calculateWinCriteria({
       setValue
     } = collectionDefinition;
     const belongsToValueGroup = collectionGroupNumber && groupValueNumbers.includes(collectionGroupNumber);
-    if (setValue || scoreValue) {
+    if (isConvertableInteger(setValue || scoreValue)) {
       aggregateValueImperative = true;
     } else if (belongsToValueGroup) {
       continue;
-    } else if (collectionValue) {
+    } else if (typeof collectionValue === "number" && isConvertableInteger(collectionValue)) {
       valueTotal += collectionValue;
     } else if (collectionValueProfiles?.length) {
       for (const collectionValueProfile of collectionValueProfiles) {
         valueTotal += collectionValueProfile.matchUpValue;
       }
-    } else if (matchUpValue) {
+    } else if (typeof matchUpValue === "number" && isConvertableInteger(matchUpValue)) {
       valueTotal += (matchUpCount || 0) * matchUpValue;
-    } else {
-      valueTotal += matchUpCount || 0;
     }
   }
   for (const collectionGroup of collectionGroups) {