tods-competition-factory 1.8.14 → 1.8.16

package/dist/forge/transform.d.ts

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

package/dist/forge/transform.mjs

@@ -2280,11 +2280,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 || []) {
@@ -2293,7 +2293,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)
@@ -2311,13 +2311,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);
@@ -2337,7 +2337,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)) {
@@ -2377,10 +2377,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;
@@ -2397,9 +2401,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;
@@ -2504,7 +2510,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) {
@@ -2519,10 +2525,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) {
@@ -2641,26 +2647,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({
@@ -2787,7 +2797,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];
@@ -9872,6 +9882,21 @@ function addNationalityCode({
   persons.forEach(annotatePerson);
 }
 
+function addIndividualParticipants({ participantMap }) {
+  const participantObjects = Object.values(participantMap);
+  for (const participantObject of participantObjects) {
+    const participant = participantObject.participant;
+    if (participant.individualParticipantIds?.length) {
+      participant.individualParticipants = [];
+      for (const participantId of participant.individualParticipantIds) {
+        participant.individualParticipants.push(
+          participantMap[participantId].participant
+        );
+      }
+    }
+  }
+}
+
 function getTimeItem({
   returnPreviousValues,
   itemSubTypes,
@@ -9974,20 +9999,6 @@ function signedIn(participant) {
   });
   return timeItem?.itemValue === SIGNED_IN;
 }
-function addIndividualParticipants({ participantMap }) {
-  const participantObjects = Object.values(participantMap);
-  for (const participantObject of participantObjects) {
-    const participant = participantObject.participant;
-    if (participant.individualParticipantIds?.length) {
-      participant.individualParticipants = [];
-      for (const participantId of participant.individualParticipantIds) {
-        participant.individualParticipants.push(
-          participantMap[participantId].participant
-        );
-      }
-    }
-  }
-}
 function processIndividualParticipantIds({
   individualParticipantIds,
   participantCopy,
@@ -10266,7 +10277,6 @@ function allEventMatchUps(params) {
   if (!event)
     return { error: MISSING_EVENT };
   const { eventId, eventName, endDate, category, gender, matchUpFormat } = event;
-  const eventMatchUps2 = [];
   const additionalContext = {
     ...context,
     ...definedAttributes({
@@ -10310,7 +10320,7 @@ function allEventMatchUps(params) {
   }).scheduleTiming;
   const matchUps = drawDefinitions.flatMap(
     (drawDefinition) => {
-      const { matchUps: matchUps2, matchUpsMap } = getAllDrawMatchUps({
+      const { matchUps: matchUps2 } = getAllDrawMatchUps({
         tournamentParticipants: participants,
         tournamentAppliedPolicies,
         scheduleVisibilityFilters,
@@ -10330,12 +10340,10 @@ function allEventMatchUps(params) {
         inContext,
         event
       });
-      if (matchUpsMap?.drawMatchUps)
-        eventMatchUps2.push(...matchUpsMap.drawMatchUps);
       return matchUps2 ?? [];
     }
   );
-  return { matchUps, eventMatchUps: eventMatchUps2 };
+  return { matchUps };
 }
 
 function addFinishingRounds({