tods-competition-factory 0.71.0 → 0.72.0

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

@@ -249,7 +249,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return '0.71.0';
+  return '0.72.0';
 }
 
 const FORMAT_STANDARD = 'SET3-S:6/TB7'; // Best of 3 Tiebreak Sets to 6
@@ -16880,14 +16880,6 @@ function getPairedPreviousMatchUpIsWOWO(params) {
     roundNumber,
     roundPosition
   }) => roundNumber === previousRoundNumber && roundPosition === pairedRoundPosition);
-  /*
-  const { pairedPreviousMatchUp } = getPairedPreviousMatchUp({
-    matchUp: sourceMatchUp,
-    structureId: structure.structureId,
-    matchUpsMap,
-  });
-  */
-
   const pairedPreviousMatchUpStatus = pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.matchUpStatus;
   const pairedPreviousMatchUpisWOWO = [DOUBLE_WALKOVER].includes(pairedPreviousMatchUpStatus);
   return {
@@ -17441,12 +17433,12 @@ function getWalkoverWinningSide({
 }
 
 function assignMatchUpDrawPosition({
+  inContextDrawMatchUps,
   drawDefinition,
-  matchUpId,
   matchUpStatus,
   drawPosition,
   matchUpsMap,
-  inContextDrawMatchUps
+  matchUpId
 }) {
   var _drawDefinition$struc, _matchUpsMap, _matchUpsMap$drawMatc;
 
@@ -17521,10 +17513,10 @@ function assignMatchUpDrawPosition({
   }
 
   const targetData = positionTargets({
-    matchUpId,
-    drawDefinition,
     inContextDrawMatchUps,
-    inContextMatchUp
+    inContextMatchUp,
+    drawDefinition,
+    matchUpId
   });
   const {
     targetMatchUps: {
@@ -17545,12 +17537,12 @@ function assignMatchUpDrawPosition({
     if (winnerMatchUp) {
       if ([BYE, DOUBLE_WALKOVER].includes(matchUpStatus)) {
         const result = assignMatchUpDrawPosition({
-          drawDefinition,
-          drawPosition,
           matchUpId: winnerMatchUp.matchUpId,
           iterative: 'brightmagenta',
-          matchUpsMap,
-          inContextDrawMatchUps
+          inContextDrawMatchUps,
+          drawDefinition,
+          drawPosition,
+          matchUpsMap
         });
         if (result.error) return result;
       } else {
@@ -17563,24 +17555,24 @@ function assignMatchUpDrawPosition({
         }
       }
     }
-  } else {
+  } else if (winnerMatchUp && !inContextMatchUp.feedRound) {
     const {
       pairedPreviousMatchUpisWOWO
     } = getPairedPreviousMatchUpIsWOWO({
       winnerMatchUp: matchUp,
       drawPosition,
-      structure,
-      matchUpsMap
+      matchUpsMap,
+      structure
     });
 
-    if (pairedPreviousMatchUpisWOWO && winnerMatchUp) {
+    if (pairedPreviousMatchUpisWOWO) {
       const result = assignMatchUpDrawPosition({
-        drawDefinition,
-        drawPosition,
         matchUpId: winnerMatchUp.matchUpId,
         iterative: 'brightred',
-        matchUpsMap,
-        inContextDrawMatchUps
+        inContextDrawMatchUps,
+        drawDefinition,
+        drawPosition,
+        matchUpsMap
       });
       if (result.error) return result;
     }
@@ -19583,9 +19575,9 @@ function attemptToSetWinningSide(params) {
 }
 
 function getPairedPreviousMatchUp({
-  matchUp,
   structureId,
-  matchUpsMap
+  matchUpsMap,
+  matchUp
 }) {
   const sourceRoundPosition = matchUp === null || matchUp === void 0 ? void 0 : matchUp.roundPosition;
   const offset = sourceRoundPosition % 2 ? 1 : -1;
@@ -19605,12 +19597,12 @@ function getPairedPreviousMatchUp({
 
 function removeDoubleWalkover(params) {
   const {
+    inContextDrawMatchUps,
     drawDefinition,
+    matchUpsMap,
     targetData,
     structure,
-    matchUp,
-    matchUpsMap,
-    inContextDrawMatchUps
+    matchUp
   } = params;
   const {
     targetLinks: {
@@ -19636,29 +19628,40 @@ function removeDoubleWalkover(params) {
 
 
   if (winnerMatchUp) {
-    var _pairedPreviousMatchU;
-
-    const noContextWinnerMatchUp = matchUpsMap === null || matchUpsMap === void 0 ? void 0 : matchUpsMap.drawMatchUps.find(matchUp => matchUp.matchUpId === winnerMatchUp.matchUpId);
-    const {
-      pairedPreviousMatchUp
-    } = getPairedPreviousMatchUp({
-      matchUp,
-      structureId: structure.structureId,
-      matchUpsMap
-    });
-    const pairedPreviousWOWO = (pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.matchUpStatus) === DOUBLE_WALKOVER;
-    const pairedPreviousDrawPositions = (pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : (_pairedPreviousMatchU = pairedPreviousMatchUp.drawPositions) === null || _pairedPreviousMatchU === void 0 ? void 0 : _pairedPreviousMatchU.filter(Boolean)) || [];
-    const pairedPreviousMatchUpComplete = [...completedMatchUpStatuses, BYE].includes(pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.matchUpStatus) || (pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.winningSide);
     const nextTargetData = positionTargets({
       matchUpId: winnerMatchUp.matchUpId,
-      drawDefinition,
-      inContextDrawMatchUps
+      inContextDrawMatchUps,
+      drawDefinition
     });
     const {
       targetMatchUps: {
         winnerMatchUp: nextWinnerMatchUp
       }
     } = nextTargetData;
+    const noContextWinnerMatchUp = matchUpsMap === null || matchUpsMap === void 0 ? void 0 : matchUpsMap.drawMatchUps.find(matchUp => matchUp.matchUpId === winnerMatchUp.matchUpId);
+    let pairedPreviousDrawPositions = [];
+    let pairedPreviousMatchUpComplete;
+    let pairedPreviousWOWO; // winnerMatchUp has context
+
+    if (winnerMatchUp.feedRound) {
+      var _nextWinnerMatchUp$dr;
+
+      pairedPreviousDrawPositions = nextWinnerMatchUp === null || nextWinnerMatchUp === void 0 ? void 0 : (_nextWinnerMatchUp$dr = nextWinnerMatchUp.drawPositions) === null || _nextWinnerMatchUp$dr === void 0 ? void 0 : _nextWinnerMatchUp$dr.filter(Boolean);
+      pairedPreviousMatchUpComplete = true;
+    } else {
+      var _pairedPreviousMatchU;
+
+      const {
+        pairedPreviousMatchUp
+      } = getPairedPreviousMatchUp({
+        structureId: structure.structureId,
+        matchUpsMap,
+        matchUp
+      });
+      pairedPreviousWOWO = (pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.matchUpStatus) === DOUBLE_WALKOVER;
+      pairedPreviousDrawPositions = (pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : (_pairedPreviousMatchU = pairedPreviousMatchUp.drawPositions) === null || _pairedPreviousMatchU === void 0 ? void 0 : _pairedPreviousMatchU.filter(Boolean)) || [];
+      pairedPreviousMatchUpComplete = [...completedMatchUpStatuses, BYE].includes(pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.matchUpStatus) || (pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.winningSide);
+    }
 
     if (pairedPreviousMatchUpComplete) {
       const sourceDrawPositions = matchUp.drawPositions || [];
@@ -19673,23 +19676,23 @@ function removeDoubleWalkover(params) {
 
       if (nextWinnerMatchUp && drawPositionToRemove) {
         const result = removeDirectedWinner({
+          winningDrawPosition: drawPositionToRemove,
           winnerMatchUp: nextWinnerMatchUp,
+          inContextDrawMatchUps,
           drawDefinition,
-          winningDrawPosition: drawPositionToRemove,
-          matchUpsMap,
-          inContextDrawMatchUps
+          matchUpsMap
         });
         if (result.error) return result;
       }
     }
 
     removeDoubleWalkover({
-      drawDefinition,
       targetData: nextTargetData,
-      structure,
       matchUp: winnerMatchUp,
+      inContextDrawMatchUps,
+      drawDefinition,
       matchUpsMap,
-      inContextDrawMatchUps
+      structure
     });
     let matchUpStatus = [WALKOVER$1, DOUBLE_WALKOVER].includes(noContextWinnerMatchUp === null || noContextWinnerMatchUp === void 0 ? void 0 : noContextWinnerMatchUp.matchUpStatus) && pairedPreviousWOWO ? WALKOVER$1 : TO_BE_PLAYED;
     const removeScore = !pairedPreviousWOWO;
@@ -20454,17 +20457,17 @@ function setMatchUpStatus$1(params) {
   }
 
   return setMatchUpStatus$2({
-    tournamentRecord,
-    drawDefinition,
-    event,
     matchUpStatusCodes: outcome === null || outcome === void 0 ? void 0 : outcome.matchUpStatusCodes,
     matchUpStatus: outcome === null || outcome === void 0 ? void 0 : outcome.matchUpStatus,
-    matchUpFormat,
-    matchUpId,
     winningSide: outcome === null || outcome === void 0 ? void 0 : outcome.winningSide,
     allowChangePropagation,
     score: outcome === null || outcome === void 0 ? void 0 : outcome.score,
+    tournamentRecord,
+    drawDefinition,
+    matchUpFormat,
+    matchUpId,
     schedule,
+    event,
     notes
   });
 }
@@ -36090,7 +36093,7 @@ function addEventEntries(params) {
   });
   let message;
 
-  if (drawId && ![UNGROUPED, UNPAIRED].includes(entryStatus)) {
+  if (drawId && !isUngrouped(entryStage)) {
     const result = addDrawEntries({
       participantIds: validParticipantIds,
       autoEntryPositions,
@@ -50750,6 +50753,7 @@ function completeDrawMatchUps({
   };
 }
 function completeDrawMatchUp({
+  matchUpStatusCodes,
   drawDefinition,
   targetMatchUp,
   matchUpStatus,
@@ -50771,6 +50775,7 @@ function completeDrawMatchUp({
     scoreString,
     winningSide
   });
+  if (matchUpStatusCodes) outcome.matchUpStatusCodes = matchUpStatusCodes;
   return setMatchUpStatus$1({
     drawDefinition,
     matchUpFormat,
@@ -52189,6 +52194,7 @@ function generateEventWithDraw({
             matchUpFormat,
             stageSequence = 1,
             matchUpStatus = COMPLETED,
+            matchUpStatusCodes,
             matchUpIndex = 0,
             structureOrder // like a group number; for RR = the order of the structureType: ITEM within structureType: CONTAINER
 
@@ -52216,6 +52222,7 @@ function generateEventWithDraw({
 
           const targetMatchUp = targetMatchUps[matchUpIndex];
           const result = completeDrawMatchUp({
+            matchUpStatusCodes,
             drawDefinition,
             targetMatchUp,
             matchUpFormat,