tods-competition-factory 1.7.9 → 1.7.10

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.7.9';
+    return '1.7.10';
 }
 
 /******************************************************************************
@@ -5095,7 +5095,7 @@ function evaluateCollectionResult(_a) {
         if (matchUp.winningSide)
             sideWins[matchUp.winningSide - 1] += 1;
     });
-    if (matchUpValue) {
+    if (isConvertableInteger(matchUpValue)) {
         // if tiebreak set count as set value and game value
         collectionMatchUps.forEach(function (matchUp) {
             if (matchUp.winningSide) {
@@ -5103,7 +5103,7 @@ function evaluateCollectionResult(_a) {
             }
         });
     }
-    else if (setValue) {
+    else if (isConvertableInteger(setValue)) {
         collectionMatchUps.forEach(function (matchUp) {
             var _a, _b;
             (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
@@ -5112,7 +5112,7 @@ function evaluateCollectionResult(_a) {
             });
         });
     }
-    else if (scoreValue) {
+    else if (isConvertableInteger(scoreValue)) {
         collectionMatchUps.forEach(function (matchUp) {
             var _a, _b;
             (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
@@ -5141,16 +5141,18 @@ function evaluateCollectionResult(_a) {
                     collectionDefinition: collectionDefinition,
                     collectionPosition: collectionPosition,
                 });
-                sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue_1;
+                if (isConvertableInteger(matchUpValue_1)) {
+                    sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue_1;
+                }
             }
         });
     }
     // processed separately so that setValue, scoreValue and collecitonValueProfile can be used in conjunction with collectionValue
-    if (collectionValue) {
+    if (isConvertableInteger(collectionValue)) {
         var collectionWinningSide = void 0;
         if (winCriteria === null || winCriteria === void 0 ? void 0 : winCriteria.aggregateValue) {
             if (allCollectionMatchUpsCompleted) {
-                if ((matchUpValue || setValue || scoreValue) &&
+                if (isConvertableInteger(matchUpValue || setValue || scoreValue) &&
                     sideMatchUpValues[0] !== sideMatchUpValues[1]) {
                     collectionWinningSide =
                         sideMatchUpValues[0] > sideMatchUpValues[1] ? 1 : 2;
@@ -5192,7 +5194,7 @@ function evaluateCollectionResult(_a) {
         }
     }
     if (!belongsToValueGroup) {
-        sideCollectionValues.forEach(function (sideCollectionValue, i) { return (sideTieValues[i] += sideCollectionValue); });
+        sideCollectionValues.forEach(function (sideCollectionValue, i) { return (sideTieValues[i] += sideCollectionValue || 0); });
     }
     else {
         groupValueGroups[collectionGroupNumber].sideWins[0] += sideWins[0] || 0;
@@ -9830,7 +9832,9 @@ function getGroupValueGroups(_a) {
     var _b = _a.collectionGroups, collectionGroups = _b === void 0 ? [] : _b;
     // set up to handle groupValue
     var groupValueGroups = Object.assign.apply(Object, __spreadArray([{}], __read(collectionGroups
-        .filter(function (group) { return (group === null || group === void 0 ? void 0 : group.groupValue) && (group === null || group === void 0 ? void 0 : group.groupNumber); })
+        .filter(function (group) {
+        return isConvertableInteger(group === null || group === void 0 ? void 0 : group.groupValue) && (group === null || group === void 0 ? void 0 : group.groupNumber);
+    })
         .map(function (group) {
         var _a;
         return (_a = {},
@@ -9907,7 +9911,7 @@ function generateTieMatchUpScore(params) {
             }, undefined);
         }
         if (groupWinningSide) {
-            sideTieValues[groupWinningSide - 1] += groupValue;
+            sideTieValues[groupWinningSide - 1] += groupValue || 0;
         }
     };
     try {
@@ -9924,7 +9928,7 @@ function generateTieMatchUpScore(params) {
         }
         finally { if (e_2) throw e_2.error; }
     }
-    var sideScores = sideTieValues.map(function (sideTieValue, i) { return sideTieValue + sideAdjustments[i]; });
+    var sideScores = sideTieValues.map(function (sideTieValue, i) { return (sideTieValue || 0) + sideAdjustments[i]; });
     var set = {
         side1Score: sideScores[0],
         side2Score: sideScores[1],
@@ -16697,7 +16701,7 @@ function calculateWinCriteria(_a) {
             var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionGroupNumber = collectionDefinition.collectionGroupNumber, collectionValue = collectionDefinition.collectionValue, matchUpCount = collectionDefinition.matchUpCount, matchUpValue = collectionDefinition.matchUpValue, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue;
             var belongsToValueGroup = collectionGroupNumber &&
                 groupValueNumbers.includes(collectionGroupNumber);
-            if (setValue || scoreValue) {
+            if (isConvertableInteger(setValue || scoreValue)) {
                 // because setValues and scoreValues are unpredictable,
                 // any collectionDefintion that has either of these two values without a collectionValue forces the tieFormat to aggregateValue
                 aggregateValueImperative = true;
@@ -16705,7 +16709,8 @@ function calculateWinCriteria(_a) {
             else if (belongsToValueGroup) {
                 continue;
             }
-            else if (collectionValue) {
+            else if (typeof collectionValue === 'number' &&
+                isConvertableInteger(collectionValue)) {
                 valueTotal += collectionValue;
             }
             else if (collectionValueProfiles === null || collectionValueProfiles === void 0 ? void 0 : collectionValueProfiles.length) {
@@ -16723,13 +16728,10 @@ function calculateWinCriteria(_a) {
                     finally { if (e_2) throw e_2.error; }
                 }
             }
-            else if (matchUpValue) {
+            else if (typeof matchUpValue === 'number' &&
+                isConvertableInteger(matchUpValue)) {
                 valueTotal += (matchUpCount || 0) * matchUpValue;
             }
-            else {
-                // default is to give each matchUp a value of 1
-                valueTotal += matchUpCount || 0;
-            }
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }