tods-competition-factory 2.2.5 → 2.2.6

package/dist/tods-competition-factory.d.ts

@@ -5377,6 +5377,7 @@ type SetMatchUpStatusArgs = {
     enableAutoCalc?: boolean;
     matchUpFormat?: string;
     tournamentId?: string;
+    setTBlast?: boolean;
     matchUpId: string;
     eventId?: string;
     drawId?: string;
@@ -8731,6 +8732,7 @@ type GenerateScoreString = {
     matchUpFormat?: string;
     winnerFirst?: boolean;
     winningSide?: number;
+    setTBlast?: boolean;
     reversed?: boolean;
     sets: any;
 };

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.2.5';
+    return '2.2.6';
 }
 
 const SINGLES_MATCHUP = 'SINGLES';
@@ -28726,7 +28726,7 @@ function generateVoluntaryConsolation(params) {
 }
 
 function generateScoreString(params) {
-    const { winnerFirst = true, addOutcomeString, reversed = false, matchUpStatus, matchUpFormat, autoComplete, winningSide, sets, } = params;
+    const { winnerFirst = true, setTBlast = true, addOutcomeString, reversed = false, matchUpStatus, matchUpFormat, autoComplete, winningSide, sets, } = params;
     if (!sets)
         return { error: MISSING_VALUE, info: 'missing sets' };
     const parsedFormat = matchUpFormat && parse(matchUpFormat);
@@ -28749,23 +28749,25 @@ function generateScoreString(params) {
         const format = isFinalSet && finalSetFormat ? finalSetFormat : setFormat;
         const hasGameScores = (set) => isNumeric(set?.side1Score) || isNumeric(set?.side2Score);
         const hasTiebreakScores = (set) => isNumeric(set?.side1TiebreakScore) || isNumeric(set?.side2TiebreakScore);
-        const isTiebreakSet = format?.tiebreakSet || (!hasGameScores(currentSet) && hasTiebreakScores(currentSet));
+        const tbscores = hasTiebreakScores(currentSet);
+        const isTiebreakSet = format?.tiebreakSet || (!hasGameScores(currentSet) && tbscores);
         const { side1Score, side2Score, side1TiebreakScore, side2TiebreakScore } = currentSet;
-        const t1 = side1TiebreakScore || (isNumeric(side1TiebreakScore) || autoComplete ? 0 : '');
-        const t2 = side2TiebreakScore || (isNumeric(side2TiebreakScore) || autoComplete ? 0 : '');
+        const t1 = side1TiebreakScore || (isNumeric(side1TiebreakScore) || (tbscores && autoComplete) ? 0 : '');
+        const t2 = side2TiebreakScore || (isNumeric(side2TiebreakScore) || (tbscores && autoComplete) ? 0 : '');
         if (isTiebreakSet) {
             const tiebreakScore = reverseScores ? [t2, t1] : [t1, t2];
             return `[${tiebreakScore.join('-')}]`;
         }
-        const lowTiebreakScore = Math.min(t1, t2);
+        const lowTiebreakScore = tbscores ? Math.min(t1, t2) : '';
         const lowTiebreakSide = lowTiebreakScore === t1 ? 1 : 2;
-        const tiebreak = lowTiebreakScore ? `(${lowTiebreakScore})` : '';
+        const tiebreak = isNumeric(lowTiebreakScore) ? `(${lowTiebreakScore})` : '';
         const s1 = side1Score || (isNumeric(side1Score) || autoComplete ? 0 : '');
         const s2 = side2Score || (isNumeric(side2Score) || autoComplete ? 0 : '');
-        const includeTiebreak = (sideNumber) => (lowTiebreakSide === sideNumber ? tiebreak : '');
+        const includeTiebreak = (sideNumber) => (!setTBlast && lowTiebreakSide === sideNumber ? tiebreak : '');
         const ss1 = `${s1}${includeTiebreak(1)}`;
         const ss2 = `${s2}${includeTiebreak(2)}`;
-        let scoreString = reverseScores ? `${[ss2, ss1].join('-')}` : `${[ss1, ss2].join('-')}`;
+        const tbLast = setTBlast && tbscores ? `(${lowTiebreakScore})` : '';
+        let scoreString = reverseScores ? `${[ss2, ss1].join('-')}${tbLast}` : `${[ss1, ss2].join('-')}${tbLast}`;
         if (['-', ' '].includes(scoreString))
             scoreString = '';
         return scoreString;
@@ -28803,10 +28805,12 @@ function reverseScore(params) {
             setNumber,
         });
     });
-    const scoreStringSide1 = generateScoreString({ sets: reversedSets });
+    const setTBlast = params?.setTBlast;
+    const scoreStringSide1 = generateScoreString({ setTBlast, sets: reversedSets });
     const scoreStringSide2 = generateScoreString({
         sets: reversedSets,
         reversed: true,
+        setTBlast,
     });
     return {
         reversedScore: { sets: reversedSets, scoreStringSide1, scoreStringSide2 },
@@ -28899,8 +28903,8 @@ function calculateHistoryScore(params) {
             tiebreakServingSide = undefined;
             sidePoints = [0, 0];
             servingSide = 3 - servingSide;
-            set.side1TiebreakScore = 0;
-            set.side2TiebreakScore = 0;
+            set.side1TiebreakScore = '';
+            set.side2TiebreakScore = '';
             set.side1PointScore = '';
             set.side2PointScore = '';
             faults = 0;
@@ -45526,7 +45530,7 @@ function resetMatchUpLineUps({ inheritance = true, tournamentRecord, drawDefinit
 }
 
 function matchUpScore(params) {
-    const { matchUpFormat, matchUpStatus, winningSide, score } = params;
+    const { matchUpFormat, matchUpStatus, winningSide, score, setTBlast } = params;
     if (!score)
         return { sets: [] };
     const sets = score.sets || [];
@@ -45534,6 +45538,7 @@ function matchUpScore(params) {
         winnerFirst: false,
         matchUpFormat,
         matchUpStatus,
+        setTBlast,
         sets,
     });
     let scoreStringSide2 = generateScoreString({
@@ -45541,12 +45546,14 @@ function matchUpScore(params) {
         reversed: true,
         matchUpFormat,
         matchUpStatus,
+        setTBlast,
         sets,
     });
     const winnerPerspective = generateScoreString({
         matchUpFormat,
         matchUpStatus,
         winningSide,
+        setTBlast,
         sets,
     });
     const loserPerspective = scoreStringSide1 === winnerPerspective ? scoreStringSide2 : scoreStringSide1;
@@ -45554,13 +45561,7 @@ function matchUpScore(params) {
         scoreStringSide1 = winningSide === 1 ? winnerPerspective : loserPerspective;
         scoreStringSide2 = winningSide === 2 ? winnerPerspective : loserPerspective;
     }
-    return {
-        score: {
-            sets,
-            scoreStringSide1,
-            scoreStringSide2,
-        },
-    };
+    return { score: { sets, scoreStringSide1, scoreStringSide2 } };
 }
 
 function setMatchUpStatus(params) {
@@ -45593,7 +45594,7 @@ function setMatchUpStatus(params) {
     const allowChangePropagation = (params.allowChangePropagation !== undefined && params.allowChangePropagation) ||
         (policy?.allowChangePropagation !== undefined && policy.allowChangePropagation) ||
         undefined;
-    const { outcome } = params;
+    const { outcome, setTBlast } = params;
     if (outcome?.winningSide && ![1, 2].includes(outcome.winningSide)) {
         return { error: INVALID_WINNING_SIDE };
     }
@@ -45609,7 +45610,7 @@ function setMatchUpStatus(params) {
             return result;
     }
     if (outcome?.score?.sets && !outcome.score.scoreStringSide1) {
-        const { score: scoreObject } = matchUpScore(outcome);
+        const { score: scoreObject } = matchUpScore({ ...outcome, setTBlast });
         outcome.score = scoreObject;
         outcome.score.sets = outcome.score.sets.filter((set) => set.side1Score || set.side2Score || set.side1TiebreakScore || set.side2TiebreakScore);
     }
@@ -46340,7 +46341,7 @@ var index$9 = {
 };
 
 function generateOutcomeFromScoreString(params) {
-    const { matchUpFormat, matchUpStatus, winningSide, scoreString } = params;
+    const { matchUpFormat, matchUpStatus, winningSide, scoreString, setTBlast } = params;
     if (!scoreString)
         return {
             outcome: {
@@ -46356,11 +46357,13 @@ function generateOutcomeFromScoreString(params) {
     const winningScoreString = generateScoreString({
         sets: neutralParsedSets,
         matchUpFormat,
+        setTBlast,
     });
     const losingScoreString = generateScoreString({
         sets: neutralParsedSets,
         reversed: true,
         matchUpFormat,
+        setTBlast,
     });
     if (winningSide === 2) {
         score.scoreStringSide1 = losingScoreString;