tods-competition-factory 2.2.36 → 2.2.37

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.2.36';
+    return '2.2.37';
 }
 
 const SINGLES_MATCHUP = 'SINGLES';
@@ -32204,17 +32204,19 @@ function validateSetScore(set, matchUpFormat, isDecidingSet, allowIncomplete) {
     const isImplicitTiebreak = setTo && winnerScore === setTo + 1 && loserScore === setTo;
     const hasTiebreak = hasExplicitTiebreak || isImplicitTiebreak;
     if (hasTiebreak) {
-        if (setTo) {
-            if (winnerScore !== setTo + 1) {
+        if (setTo && tiebreakAt) {
+            const expectedWinnerScore = tiebreakAt === setTo ? setTo + 1 : setTo;
+            const expectedLoserScore = tiebreakAt;
+            if (winnerScore !== expectedWinnerScore) {
                 return {
                     isValid: false,
-                    error: `Tiebreak set winner must have ${setTo + 1} games, got ${winnerScore}`,
+                    error: `Tiebreak set winner must have ${expectedWinnerScore} games, got ${winnerScore}`,
                 };
             }
-            if (loserScore !== setTo) {
+            if (loserScore !== expectedLoserScore) {
                 return {
                     isValid: false,
-                    error: `Tiebreak set loser must have ${setTo} games when tied, got ${loserScore}`,
+                    error: `Tiebreak set loser must have ${expectedLoserScore} games, got ${loserScore}`,
                 };
             }
         }
@@ -32273,23 +32275,25 @@ function validateSetScore(set, matchUpFormat, isDecidingSet, allowIncomplete) {
                 error: `Set winner must reach ${setTo} games, got ${winnerScore}`,
             };
         }
-        if (scoreDiff < 2) {
+        const isTiebreakWon = tiebreakAt && winnerScore === setTo && loserScore === tiebreakAt && scoreDiff === 1;
+        if (scoreDiff < 2 && !isTiebreakWon) {
             return {
                 isValid: false,
                 error: `Set must be won by at least 2 games, got ${winnerScore}-${loserScore}`,
             };
         }
         if (tiebreakAt) {
-            if (loserScore >= tiebreakAt) {
+            if (loserScore >= tiebreakAt && !isTiebreakWon) {
                 return {
                     isValid: false,
                     error: `When tied at ${tiebreakAt}-${tiebreakAt}, must play tiebreak. Use format like ${tiebreakAt + 1}-${tiebreakAt}(5)`,
                 };
             }
-            if (winnerScore > setTo + 1) {
+            const maxWinnerScore = tiebreakAt === setTo ? setTo + 1 : setTo;
+            if (winnerScore > maxWinnerScore) {
                 return {
                     isValid: false,
-                    error: `With tiebreak format, set score cannot exceed ${setTo + 1}-${setTo - 1}. Got ${winnerScore}-${loserScore}`,
+                    error: `With tiebreak format, set score cannot exceed ${maxWinnerScore}-${tiebreakAt}. Got ${winnerScore}-${loserScore}`,
                 };
             }
         }