tods-competition-factory 1.6.11 → 1.6.13

package/dist/forge/generate.mjs

@@ -2854,7 +2854,7 @@ function validMatchUp(matchUp) {
   const { matchUpId, drawPositions } = matchUp;
   const validMatchUpId = typeof matchUpId === "string";
   const validDrawPositions = !drawPositions || Array.isArray(drawPositions) && drawPositions.length <= 2 && drawPositions.every(
-    (dp) => isConvertableInteger(dp) || dp === void 0
+    (dp) => isConvertableInteger(dp) || dp === void 0 || dp === null
   );
   return validMatchUpId && validDrawPositions;
 }
@@ -3689,9 +3689,10 @@ function getSourceDrawPositionRanges({
         structureId: sourceStructureId,
         matchUpsMap
       });
-      const { roundProfile } = getRoundMatchUps({
+      const roundMatchUpsResult = getRoundMatchUps({
         matchUps: structureMatchUps2
       });
+      const roundProfile = roundMatchUpsResult.roundProfile;
       return { [sourceStructureId]: roundProfile };
     })
   );
@@ -5307,7 +5308,7 @@ function getValidSeedBlocks({
   });
   const { positionAssignments } = structureAssignedDrawPositions({ structure });
   const positionsCount = positionAssignments?.length;
-  const seedsCount = seedAssignments?.length || 0;
+  const seedsCount = seedAssignments?.length ?? 0;
   let allDrawPositions = [];
   const roundNumbers = Object.keys(roundMatchUps).map((n) => parseInt(n)).sort((a, b) => a - b);
   const uniqueDrawPositionsByRound = roundNumbers.map((roundNumber) => {
@@ -5569,7 +5570,7 @@ function getNextSeedBlock(params) {
   const seedsWithoutDrawPositions = seedAssignments?.filter(
     (assignment) => !assignment.participantId
   );
-  const seedsLeftToAssign = unplacedSeedAssignments?.length || seedsWithoutDrawPositions?.length;
+  const seedsLeftToAssign = unplacedSeedAssignments?.length && unplacedSeedAssignments.length > 0 ? unplacedSeedAssignments.length : seedsWithoutDrawPositions?.length ?? 0;
   const unfilled = seedsLeftToAssign && nextSeedBlock?.drawPositions.filter(
     (drawPosition) => !assignedDrawPositions?.includes(drawPosition)
   ) || [];
@@ -14919,7 +14920,7 @@ function getParticipantResults({
     const manualGamesOverride = tieFormat && matchUp._disableAutoCalc && tieFormat.collectionDefinitions.every(({ scoreValue }) => scoreValue);
     const winningParticipantId = winningSide && getWinningSideId(matchUp);
     const losingParticipantId = winningSide && getLosingSideId(matchUp);
-    if (!winningParticipantId || !losingParticipantId) {
+    if (!winningParticipantId && !losingParticipantId) {
       if (completedMatchUpStatuses.includes(matchUpStatus)) {
         const participantIdSide1 = getSideId(matchUp, 0);
         const participantIdSide2 = getSideId(matchUp, 1);
@@ -14931,53 +14932,51 @@ function getParticipantResults({
           checkInitializeParticipant(participantResults, participantIdSide2);
           participantResults[participantIdSide2].matchUpsCancelled += 1;
         }
-      } else {
-        if (tieMatchUps?.length) {
-          perPlayer = 0;
-          for (const tieMatchUp of tieMatchUps) {
-            if (tieMatchUp.winningSide) {
-              const tieWinningParticipantId = sides.find(
-                ({ sideNumber }) => sideNumber === tieMatchUp.winningSide
-              )?.participantId;
-              const tieLosingParticipantId = sides.find(
-                ({ sideNumber }) => sideNumber === tieMatchUp.winningSide
-              )?.participantId;
-              if (tieWinningParticipantId && tieLosingParticipantId) {
-                checkInitializeParticipant(
-                  participantResults,
-                  tieWinningParticipantId
-                );
-                checkInitializeParticipant(
-                  participantResults,
-                  tieLosingParticipantId
-                );
-                participantResults[tieWinningParticipantId].tieMatchUpsWon += 1;
-                participantResults[tieLosingParticipantId].tieMatchUpsLost += 1;
-                if (tieMatchUp.matchUpType === SINGLES$1) {
-                  participantResults[tieWinningParticipantId].tieSinglesWon += 1;
-                  participantResults[tieLosingParticipantId].tieSinglesLost += 1;
-                } else if (tieMatchUp.matchUpType === DOUBLES$1) {
-                  participantResults[tieWinningParticipantId].tieDoublesWon += 1;
-                  participantResults[tieLosingParticipantId].tieDoublesLost += 1;
-                }
+      } else if (tieMatchUps?.length) {
+        perPlayer = 0;
+        for (const tieMatchUp of tieMatchUps) {
+          if (tieMatchUp.winningSide) {
+            const tieWinningParticipantId = sides.find(
+              ({ sideNumber }) => sideNumber === tieMatchUp.winningSide
+            )?.participantId;
+            const tieLosingParticipantId = sides.find(
+              ({ sideNumber }) => sideNumber === tieMatchUp.winningSide
+            )?.participantId;
+            if (tieWinningParticipantId && tieLosingParticipantId) {
+              checkInitializeParticipant(
+                participantResults,
+                tieWinningParticipantId
+              );
+              checkInitializeParticipant(
+                participantResults,
+                tieLosingParticipantId
+              );
+              participantResults[tieWinningParticipantId].tieMatchUpsWon += 1;
+              participantResults[tieLosingParticipantId].tieMatchUpsLost += 1;
+              if (tieMatchUp.matchUpType === SINGLES$1) {
+                participantResults[tieWinningParticipantId].tieSinglesWon += 1;
+                participantResults[tieLosingParticipantId].tieSinglesLost += 1;
+              } else if (tieMatchUp.matchUpType === DOUBLES$1) {
+                participantResults[tieWinningParticipantId].tieDoublesWon += 1;
+                participantResults[tieLosingParticipantId].tieDoublesLost += 1;
               }
             }
-            processScore({
-              score: tieMatchUp.score,
-              manualGamesOverride,
-              participantResults,
-              sides
-              // use sides from the TEAM matchUp
-            });
           }
-        } else {
           processScore({
+            score: tieMatchUp.score,
             manualGamesOverride,
             participantResults,
-            score,
             sides
+            // use sides from the TEAM matchUp
           });
         }
+      } else {
+        processScore({
+          manualGamesOverride,
+          participantResults,
+          score,
+          sides
+        });
       }
     } else {
       checkInitializeParticipant(participantResults, winningParticipantId);
@@ -15827,9 +15826,8 @@ function modifyMatchUpScore({
         return { error: MATCHUP_NOT_FOUND };
       ({ matchUp, structure } = findResult);
     }
-  } else {
-    if (matchUp.matchUpId !== matchUpId)
-      console.log("!!!!!");
+  } else if (matchUp.matchUpId !== matchUpId) {
+    console.log("!!!!!");
   }
   if (matchUpStatus && [WALKOVER$1, DOUBLE_WALKOVER].includes(matchUpStatus) || removeScore) {
     Object.assign(matchUp, { ...toBePlayed });
@@ -15867,31 +15865,45 @@ function modifyMatchUpScore({
     })?.appliedPolicies;
     defaultedProcessCodes = appliedPolicies?.[POLICY_TYPE_SCORING]?.processCodes?.incompleteAssignmentsOnDefault;
   }
-  if (structure?.structureType === CONTAINER && !matchUp.collectionId) {
-    matchUpFormat = isDualMatchUp ? "SET1-S:T100" : matchUpFormat || matchUp.matchUpFormat || structure?.matchUpFormat || drawDefinition?.matchUpFormat || event?.matchUpFormat;
-    const itemStructure = structure.structures.find((itemStructure2) => {
-      return itemStructure2?.matchUps.find(
-        (matchUp2) => matchUp2.matchUpId === matchUpId
-      );
-    });
-    const matchUpFilters = isDualMatchUp ? { matchUpTypes: [TEAM$2] } : void 0;
-    const { matchUps } = getAllStructureMatchUps({
-      afterRecoveryTimes: false,
-      structure: itemStructure,
-      inContext: true,
-      matchUpFilters,
-      event
-    });
-    const result = updateAssignmentParticipantResults({
-      positionAssignments: itemStructure.positionAssignments,
-      tournamentRecord,
-      drawDefinition,
-      matchUpFormat,
-      matchUps,
-      event
-    });
-    if (result.error)
-      return decorateResult({ result, stack });
+  if (!matchUp.collectionId) {
+    const isRoundRobin = structure?.structureType === CONTAINER;
+    const isAdHocStructure = isAdHoc({ drawDefinition, structure });
+    if (isLucky({ drawDefinition, structure }) || isAdHocStructure || isRoundRobin) {
+      const updateTally = (structure2) => {
+        matchUpFormat = isDualMatchUp ? "SET1-S:T100" : matchUpFormat ?? matchUp.matchUpFormat ?? structure2?.matchUpFormat ?? drawDefinition?.matchUpFormat ?? event?.matchUpFormat;
+        const matchUpFilters = isDualMatchUp ? { matchUpTypes: [TEAM$2] } : void 0;
+        const { matchUps } = getAllStructureMatchUps({
+          afterRecoveryTimes: false,
+          inContext: true,
+          matchUpFilters,
+          structure: structure2,
+          event
+        });
+        if (isAdHocStructure) {
+          structure2.positionAssignments = unique(
+            matchUps.flatMap(
+              (matchUp2) => (matchUp2.sides ?? []).map((side) => side.participantId)
+            ).filter(Boolean)
+          ).map((participantId) => ({ participantId }));
+        }
+        return updateAssignmentParticipantResults({
+          positionAssignments: structure2.positionAssignments,
+          tournamentRecord,
+          drawDefinition,
+          matchUpFormat,
+          matchUps,
+          event
+        });
+      };
+      const itemStructure = isRoundRobin && structure.structures.find((itemStructure2) => {
+        return itemStructure2?.matchUps.find(
+          (matchUp2) => matchUp2.matchUpId === matchUpId
+        );
+      });
+      const result = updateTally(itemStructure || structure);
+      if (result.error)
+        return decorateResult({ result, stack });
+    }
   }
   if (notes) {
     const result = addNotes({ element: matchUp, notes });