tods-competition-factory 1.8.15 → 1.8.16

package/dist/forge/generate.d.ts

@@ -523,6 +523,7 @@ interface Side {
     lineUp?: TeamCompetitor[];
     notes?: string;
     participantId?: string;
+    participant?: Participant;
     sideNumber?: number;
     timeItems?: TimeItem[];
     updatedAt?: Date | string;

package/dist/forge/generate.mjs

@@ -14910,11 +14910,11 @@ function countSets({
   score
 }) {
   const setsTally = [0, 0];
-  const { sets } = score || {};
-  const matchUpWinnerIndex = matchUpWinningSide - 1;
+  const sets = score?.sets;
+  const matchUpWinnerIndex = typeof matchUpWinningSide === "number" && matchUpWinningSide - 1;
   const parsedMatchUpFormat = parse(matchUpFormat);
   const setsToWin = getSetsToWin(parsedMatchUpFormat?.bestOf ?? 1);
-  if (matchUpStatus === DEFAULTED && tallyPolicy?.setsCreditForDefaults || matchUpStatus === WALKOVER$1 && tallyPolicy?.setsCreditForWalkovers) {
+  if (typeof matchUpWinnerIndex === "number" && (matchUpStatus === DEFAULTED && tallyPolicy?.setsCreditForDefaults || matchUpStatus === WALKOVER$1 && tallyPolicy?.setsCreditForWalkovers)) {
     setsTally[matchUpWinnerIndex] = setsToWin;
   } else {
     for (const set of sets || []) {
@@ -14923,7 +14923,7 @@ function countSets({
         setsTally[setWinningSide - 1] += 1;
     }
   }
-  if (matchUpStatus === RETIRED) {
+  if (typeof matchUpWinnerIndex === "number" && matchUpStatus === RETIRED) {
     if (+setsTally[1 - matchUpWinnerIndex] === setsToWin)
       setsTally[1 - matchUpWinnerIndex] -= 1;
     if (tallyPolicy?.setsCreditForRetirements)
@@ -14941,13 +14941,13 @@ function countGames({
   const { sets } = score || {};
   if (!sets)
     return [0, 0];
-  const matchUpWinnerIndex = matchUpWinningSide - 1;
+  const matchUpWinnerIndex = typeof matchUpWinningSide === "number" && matchUpWinningSide - 1;
   const parsedMatchUpFormat = parse(matchUpFormat);
   const bestOf = parsedMatchUpFormat?.bestOf ?? 1;
   const setsToWin = getSetsToWin(bestOf);
   const tiebreakAt = parsedMatchUpFormat?.setFormat?.tiebreakAt || 0;
   const gamesTally = [[], []];
-  if (matchUpStatus === DEFAULTED && tallyPolicy?.gamesCreditForDefaults || matchUpStatus === WALKOVER$1 && tallyPolicy?.gamesCreditForWalkovers) {
+  if (typeof matchUpWinnerIndex === "number" && (matchUpStatus === DEFAULTED && tallyPolicy?.gamesCreditForDefaults || matchUpStatus === WALKOVER$1 && tallyPolicy?.gamesCreditForWalkovers)) {
     const gamesForSet = parsedMatchUpFormat?.setFormat?.setTo || 0;
     const minimumGameWins = setsToWin * gamesForSet;
     gamesTally[matchUpWinnerIndex].push(minimumGameWins);
@@ -14967,7 +14967,7 @@ function countGames({
       }
     });
   }
-  if (matchUpStatus === RETIRED) {
+  if (matchUpStatus === RETIRED && typeof matchUpWinnerIndex === "number") {
     const whichFormat = sets.length > setsToWin && parsedMatchUpFormat?.finalSetFormat ? "finalSetFormat" : "setFormat";
     const format = parsedMatchUpFormat?.[whichFormat];
     if (isGamesBased(format.based)) {
@@ -15007,10 +15007,14 @@ function countGames({
     gamesTally[1].reduce((a, b) => a + b, 0)
   ];
 }
-function countPoints({ matchUpFormat, score }) {
-  const parsedMatchUpFormat = parse(matchUpFormat);
+function countPoints({
+  matchUpFormat,
+  score
+}) {
+  const parsedMatchUpFormat = matchUpFormat ? parse(matchUpFormat) : void 0;
   const bestOf = parsedMatchUpFormat?.bestOf ?? 1;
   const setsToWin = getSetsToWin(bestOf);
+  const tiebreaksTally = [0, 0];
   const pointsTally = [0, 0];
   score?.sets?.forEach((set, i) => {
     const setNumber = set.setNumber || i + 1;
@@ -15027,9 +15031,11 @@ function countPoints({ matchUpFormat, score }) {
         pointsTally[0] += ensureInt(set.side1TiebreakScore || 0);
       if (set.side2TiebreakScore)
         pointsTally[1] += ensureInt(set.side2TiebreakScore || 0);
+      if ((set.side1TiebreakScore || set.side2TiebreakScore) && set.winningSide)
+        tiebreaksTally[set.winningSide - 1] += 1;
     }
   });
-  return pointsTally;
+  return { pointsTally, tiebreaksTally };
 }
 function getSetsToWin(bestOfGames) {
   return bestOfGames && Math.ceil(bestOfGames / 2) || 1;
@@ -15129,7 +15135,7 @@ function getParticipantResults({
     const winningParticipantId = winningSide && getWinningSideId(matchUp);
     const losingParticipantId = winningSide && getLosingSideId(matchUp);
     if (!winningParticipantId && !losingParticipantId) {
-      if (completedMatchUpStatuses.includes(matchUpStatus)) {
+      if (matchUpStatus && completedMatchUpStatuses.includes(matchUpStatus)) {
         const participantIdSide1 = getSideId(matchUp, 0);
         const participantIdSide2 = getSideId(matchUp, 1);
         if (participantIdSide1) {
@@ -15144,10 +15150,10 @@ function getParticipantResults({
         perPlayer = 0;
         for (const tieMatchUp of tieMatchUps) {
           if (tieMatchUp.winningSide) {
-            const tieWinningParticipantId = sides.find(
+            const tieWinningParticipantId = sides?.find(
               ({ sideNumber }) => sideNumber === tieMatchUp.winningSide
             )?.participantId;
-            const tieLosingParticipantId = sides.find(
+            const tieLosingParticipantId = sides?.find(
               ({ sideNumber }) => sideNumber === tieMatchUp.winningSide
             )?.participantId;
             if (tieWinningParticipantId && tieLosingParticipantId) {
@@ -15266,26 +15272,30 @@ function getParticipantResults({
       }
     }
     if (manualGamesOverride) {
-      const side1participantId = sides.find(
+      const side1participantId = sides?.find(
         ({ sideNumber }) => sideNumber === 1
       )?.participantId;
-      const side2participantId = sides.find(
+      const side2participantId = sides?.find(
         ({ sideNumber }) => sideNumber === 2
       )?.participantId;
       checkInitializeParticipant(participantResults, side1participantId);
       checkInitializeParticipant(participantResults, side2participantId);
-      const gamesWonSide1 = score.sets.reduce(
-        (total, set) => total + set.side1Score,
+      const gamesWonSide1 = score?.sets?.reduce(
+        (total, set) => total + (set?.side1Score ?? 0),
         0
       );
-      const gamesWonSide2 = score.sets.reduce(
-        (total, set) => total + set.side2Score,
+      const gamesWonSide2 = score?.sets?.reduce(
+        (total, set) => total + (set.side2Score ?? 0),
         0
       );
-      participantResults[side1participantId].gamesWon += gamesWonSide1;
-      participantResults[side2participantId].gamesWon += gamesWonSide2;
-      participantResults[side1participantId].gamesLost += gamesWonSide2;
-      participantResults[side2participantId].gamesLost += gamesWonSide1;
+      if (side1participantId) {
+        participantResults[side1participantId].gamesWon += gamesWonSide1;
+        participantResults[side1participantId].gamesLost += gamesWonSide2;
+      }
+      if (side2participantId) {
+        participantResults[side2participantId].gamesWon += gamesWonSide2;
+        participantResults[side2participantId].gamesLost += gamesWonSide1;
+      }
     }
   }
   calculatePercentages({
@@ -15412,7 +15422,7 @@ function processMatchUp({
     winningSide,
     score
   });
-  const pointsTally = countPoints({ score, matchUpFormat });
+  const { pointsTally } = countPoints({ score, matchUpFormat });
   if (winningParticipantId) {
     participantResults[winningParticipantId].setsWon += setsTally[winningSideIndex];
     participantResults[winningParticipantId].setsLost += setsTally[losingSideIndex];