tods-competition-factory 2.2.40 → 2.2.41

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.2.40';
+    return '2.2.41';
 }
 
 const SINGLES_MATCHUP = 'SINGLES';
@@ -32366,6 +32366,24 @@ function validateSetScore(set, matchUpFormat, isDecidingSet, allowIncomplete) {
     const setFormat = isDecidingSet && parsed.finalSetFormat ? parsed.finalSetFormat : parsed.setFormat;
     if (!setFormat)
         return { isValid: true };
+    if (setFormat.timed) {
+        if (!allowIncomplete) {
+            const side1Score = set.side1Score ?? 0;
+            const side2Score = set.side2Score ?? 0;
+            if (side1Score === 0 && side2Score === 0) {
+                return { isValid: false, error: 'Timed set requires at least one side to have scored' };
+            }
+            if (setFormat.based === 'P') {
+                if (side1Score === side2Score && side1Score > 0 && setFormat.tiebreakFormat) {
+                    const hasTiebreak = set.side1TiebreakScore !== undefined || set.side2TiebreakScore !== undefined;
+                    if (!hasTiebreak) {
+                        return { isValid: false, error: 'Tied timed set requires tiebreak' };
+                    }
+                }
+            }
+        }
+        return { isValid: true };
+    }
     const { setTo, tiebreakAt, tiebreakFormat, tiebreakSet } = setFormat;
     const tiebreakSetTo = tiebreakSet?.tiebreakTo;
     const isTiebreakOnlyFormat = !!tiebreakSetTo && !setTo;
@@ -47237,43 +47255,79 @@ function generateOutcomeFromScoreString(params) {
     const isBracketNotation = scoreString?.trim().startsWith('[');
     let inferredWinningSide = winningSide;
     if (!inferredWinningSide && matchUpFormat && neutralParsedSets) {
-        const setsWon = { side1: 0, side2: 0 };
-        neutralParsedSets.forEach((set) => {
-            if (set.winningSide === 1)
-                setsWon.side1++;
-            else if (set.winningSide === 2)
-                setsWon.side2++;
-        });
-        if (setsWon.side1 > setsWon.side2)
-            inferredWinningSide = 1;
-        else if (setsWon.side2 > setsWon.side1)
-            inferredWinningSide = 2;
+        const parsedFormat = parse(matchUpFormat);
+        const isAggregateScoring = parsedFormat?.setFormat?.based === 'A' || parsedFormat?.finalSetFormat?.based === 'A';
+        if (isAggregateScoring) {
+            const aggregateTotals = neutralParsedSets.reduce((totals, set) => {
+                if (set.side1Score !== undefined || set.side2Score !== undefined) {
+                    totals.side1 += set.side1Score ?? 0;
+                    totals.side2 += set.side2Score ?? 0;
+                }
+                return totals;
+            }, { side1: 0, side2: 0 });
+            if (aggregateTotals.side1 > aggregateTotals.side2)
+                inferredWinningSide = 1;
+            else if (aggregateTotals.side2 > aggregateTotals.side1)
+                inferredWinningSide = 2;
+            else {
+                const tiebreakSet = neutralParsedSets.find((set) => set.side1TiebreakScore !== undefined || set.side2TiebreakScore !== undefined);
+                if (tiebreakSet)
+                    inferredWinningSide = tiebreakSet.winningSide;
+            }
+        }
+        else {
+            const setsWon = { side1: 0, side2: 0 };
+            neutralParsedSets.forEach((set) => {
+                if (set.winningSide === 1)
+                    setsWon.side1++;
+                else if (set.winningSide === 2)
+                    setsWon.side2++;
+            });
+            if (setsWon.side1 > setsWon.side2)
+                inferredWinningSide = 1;
+            else if (setsWon.side2 > setsWon.side1)
+                inferredWinningSide = 2;
+        }
     }
     const score = {};
-    const winningScoreString = generateScoreString({
-        sets: neutralParsedSets,
-        matchUpFormat,
-        setTBlast,
-    });
-    const losingScoreString = generateScoreString({
-        sets: neutralParsedSets,
-        reversed: true,
-        matchUpFormat,
-        setTBlast,
-    });
-    if (isBracketNotation) {
-        score.scoreStringSide1 = winningScoreString;
-        score.scoreStringSide2 = losingScoreString;
-    }
-    else if (inferredWinningSide === 2) {
-        score.scoreStringSide1 = losingScoreString;
-        score.scoreStringSide2 = winningScoreString;
+    const parsedFormat = parse(matchUpFormat);
+    const isAggregateScoring = parsedFormat?.setFormat?.based === 'A' || parsedFormat?.finalSetFormat?.based === 'A';
+    if (isBracketNotation || isAggregateScoring) {
+        score.sets = parseScoreString({ scoreString, matchUpFormat });
+        score.scoreStringSide1 = generateScoreString({
+            sets: score.sets,
+            matchUpFormat,
+            setTBlast,
+        });
+        score.scoreStringSide2 = generateScoreString({
+            sets: score.sets,
+            reversed: true,
+            matchUpFormat,
+            setTBlast,
+        });
     }
     else {
-        score.scoreStringSide1 = winningScoreString;
-        score.scoreStringSide2 = losingScoreString;
+        const winningScoreString = generateScoreString({
+            sets: neutralParsedSets,
+            matchUpFormat,
+            setTBlast,
+        });
+        const losingScoreString = generateScoreString({
+            sets: neutralParsedSets,
+            reversed: true,
+            matchUpFormat,
+            setTBlast,
+        });
+        if (inferredWinningSide === 2) {
+            score.scoreStringSide1 = losingScoreString;
+            score.scoreStringSide2 = winningScoreString;
+        }
+        else {
+            score.scoreStringSide1 = winningScoreString;
+            score.scoreStringSide2 = losingScoreString;
+        }
+        score.sets = parseScoreString({ scoreString: score.scoreStringSide1, matchUpFormat });
     }
-    score.sets = parseScoreString({ scoreString: score.scoreStringSide1, matchUpFormat });
     return definedAttributes({
         outcome: {
             matchUpStatus,