tods-competition-factory 1.7.0 → 1.7.2

package/dist/forge/generate.mjs

@@ -10760,7 +10760,7 @@ function assignMatchUpDrawPosition({
       inContext: true,
       drawDefinition,
       matchUpsMap
-    }).matchUps || [];
+    }).matchUps ?? [];
   }
   const inContextMatchUp = inContextDrawMatchUps.find(
     (m) => m.matchUpId === matchUpId
@@ -10774,7 +10774,7 @@ function assignMatchUpDrawPosition({
   const matchUp = matchUpsMap?.drawMatchUps?.find(
     (matchUp2) => matchUp2.matchUpId === matchUpId
   );
-  const drawPositions = matchUp?.drawPositions || [];
+  const drawPositions = matchUp?.drawPositions ?? [];
   const { positionAdded, positionAssigned, updatedDrawPositions } = getUpdatedDrawPositions({ drawPosition, drawPositions });
   const { positionAssignments } = getPositionAssignments({
     drawDefinition,
@@ -10791,7 +10791,7 @@ function assignMatchUpDrawPosition({
       inContext: true,
       drawDefinition,
       matchUpsMap
-    }).matchUps || [];
+    }).matchUps ?? [];
     const exitWinningSide = isDoubleExitExit && getExitWinningSide({
       inContextDrawMatchUps,
       drawPosition,
@@ -10879,7 +10879,7 @@ function assignMatchUpDrawPosition({
     const inContextTargetMatchUp = inContextDrawMatchUps?.find(
       ({ matchUpId: matchUpId2 }) => matchUpId2 === matchUp.matchUpId
     );
-    const sides = inContextTargetMatchUp?.sides || [];
+    const sides = inContextTargetMatchUp?.sides ?? [];
     const drawPositionSideIndex = sides.reduce(
       (index, side, i) => side.drawPosition === drawPosition ? i : index,
       void 0
@@ -16225,11 +16225,15 @@ function isValid(matchUpFormat) {
   if (typeof matchUpFormat !== "string")
     return false;
   const parsedFormat = parse(matchUpFormat);
-  const setParts = matchUpFormat.match(/-S:(\d+)+\/TB(\d+)@?(\d*)*/);
+  const setParts = matchUpFormat.match(
+    /-S:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/
+  );
   const setsTo = setParts?.[1];
   const tiebreakTo = setParts?.[2];
   const tiebreakAt = setParts?.[3];
-  const finalSetParts = matchUpFormat.match(/-F:(\d+)+\/TB(\d+)@?(\d*)*/);
+  const finalSetParts = matchUpFormat.match(
+    /-F:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/
+  );
   const finalSetTo = finalSetParts?.[1];
   const finalSetTiebreakTo = finalSetParts?.[2];
   const finalTiebreakAt = finalSetParts?.[3];
@@ -16338,15 +16342,17 @@ function validateTieFormat(params) {
 function validateCollectionDefinition({
   collectionDefinition,
   checkCollectionIds,
+  checkGender = true,
   referenceGender,
-  checkGender
+  event
 }) {
+  referenceGender = referenceGender ?? event?.gender;
   const errors = [];
   if (typeof collectionDefinition !== "object") {
     errors.push(
       `collectionDefinition must be an object: ${collectionDefinition}`
     );
-    return { errors };
+    return { errors, error: INVALID_OBJECT };
   }
   const {
     collectionValueProfiles,
@@ -16405,7 +16411,7 @@ function validateCollectionDefinition({
     errors.push(`Invalid gender: ${gender}`);
   }
   if (errors.length)
-    return { errors };
+    return { errors, error: INVALID_OBJECT };
   return { valid: true };
 }
 function checkTieFormat(tieFormat) {
@@ -19708,6 +19714,13 @@ function generateAdHocMatchUps({
     structureId = drawDefinition.structures?.[0]?.structureId;
   if (typeof structureId !== "string")
     return { error: MISSING_STRUCTURE_ID };
+  if (newRound && !matchUpsCount) {
+    const selectedEntries = drawDefinition?.entries?.filter((entry) => {
+      const entryStatus = entry.entryStatus;
+      return STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
+    }) ?? [];
+    matchUpsCount = Math.floor(selectedEntries?.length / 2) || 1;
+  }
   if (participantIdPairings && !Array.isArray(participantIdPairings) || matchUpsCount && !isConvertableInteger(matchUpsCount) || matchUpIds && !Array.isArray(matchUpIds) || !participantIdPairings && !matchUpsCount) {
     return { error: INVALID_VALUES, info: "matchUpsCount or pairings error" };
   }