tods-competition-factory 1.7.0 → 1.7.2

package/dist/index.mjs

@@ -308,11 +308,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];
@@ -329,7 +333,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.7.0";
+  return "1.7.2";
 }
 
 function getObjectTieFormat(obj) {
@@ -2574,15 +2578,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,
@@ -2641,7 +2647,7 @@ function validateCollectionDefinition({
     errors.push(`Invalid gender: ${gender}`);
   }
   if (errors.length)
-    return { errors };
+    return { errors, error: INVALID_OBJECT };
   return { valid: true };
 }
 function checkTieFormat(tieFormat) {
@@ -21756,7 +21762,7 @@ function assignMatchUpDrawPosition({
       inContext: true,
       drawDefinition,
       matchUpsMap
-    }).matchUps || [];
+    }).matchUps ?? [];
   }
   const inContextMatchUp = inContextDrawMatchUps.find(
     (m) => m.matchUpId === matchUpId
@@ -21770,7 +21776,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$1({
     drawDefinition,
@@ -21787,7 +21793,7 @@ function assignMatchUpDrawPosition({
       inContext: true,
       drawDefinition,
       matchUpsMap
-    }).matchUps || [];
+    }).matchUps ?? [];
     const exitWinningSide = isDoubleExitExit && getExitWinningSide({
       inContextDrawMatchUps,
       drawPosition,
@@ -21875,7 +21881,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
@@ -30329,8 +30335,10 @@ function addCollectionDefinition$1({
   updateInProgressMatchUps = true,
   collectionDefinition,
   tournamentRecord,
+  referenceGender,
   drawDefinition,
   tieFormatName,
+  enforceGender,
   structureId,
   matchUpId,
   matchUp,
@@ -30338,8 +30346,18 @@ function addCollectionDefinition$1({
   uuids,
   event
 }) {
+  const appliedPolicies = getAppliedPolicies({
+    tournamentRecord,
+    drawDefinition,
+    event
+  }).appliedPolicies ?? {};
+  enforceGender = enforceGender ?? appliedPolicies?.[POLICY_TYPE_MATCHUP_ACTIONS]?.participants?.enforceGender;
+  const checkGender = !!(enforceGender !== false && event?.gender);
   const { valid, errors } = validateCollectionDefinition({
-    collectionDefinition
+    collectionDefinition,
+    referenceGender,
+    checkGender,
+    event
   });
   if (!valid)
     return { error: INVALID_VALUES, errors };
@@ -30354,7 +30372,7 @@ function addCollectionDefinition$1({
   if (result?.error)
     return { error: result.error };
   const structure = result?.structure;
-  matchUp = matchUp || result?.matchUp;
+  matchUp = matchUp ?? result?.matchUp;
   const existingTieFormat = result?.tieFormat;
   const tieFormat = copyTieFormat(existingTieFormat);
   result = validateTieFormat({ tieFormat });
@@ -30394,12 +30412,12 @@ function addCollectionDefinition$1({
   result = validateTieFormat({ tieFormat: prunedTieFormat });
   if (result?.error)
     return { error: result.error };
-  if (eventId) {
+  if (eventId && event) {
     event.tieFormat = prunedTieFormat;
-    for (const drawDefinition2 of event.drawDefinitions || []) {
+    for (const drawDefinition2 of event.drawDefinitions ?? []) {
       if (drawDefinition2.tieFormat)
         continue;
-      for (const structure2 of drawDefinition2.structures || []) {
+      for (const structure2 of drawDefinition2.structures ?? []) {
         if (structure2.tieFormat)
           continue;
         const result2 = updateStructureMatchUps({
@@ -30464,7 +30482,7 @@ function addCollectionDefinition$1({
     });
   } else if (drawDefinition) {
     drawDefinition.tieFormat = prunedTieFormat;
-    for (const structure2 of drawDefinition.structures || []) {
+    for (const structure2 of drawDefinition.structures ?? []) {
       const result2 = updateStructureMatchUps({
         updateInProgressMatchUps,
         collectionDefinition,
@@ -30486,7 +30504,6 @@ function addCollectionDefinition$1({
   } else {
     return { error: MISSING_DRAW_DEFINITION };
   }
-  const { appliedPolicies } = getAppliedPolicies({ tournamentRecord });
   if (appliedPolicies?.audit?.[TIE_FORMAT_MODIFICATIONS]) {
     const auditData = definedAttributes({
       drawId: drawDefinition?.drawId,
@@ -44087,9 +44104,12 @@ function deleteAdHocMatchUps$1({
   if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
     return { error: INVALID_STRUCTURE };
   }
-  const matchUpsToDelete = existingMatchUps?.filter(
-    ({ matchUpId }) => matchUpIds.includes(matchUpId)
-  ) ?? [];
+  const matchUpIdsWithScoreValue = [];
+  const matchUpsToDelete = existingMatchUps?.filter(({ matchUpId, score }) => {
+    if (scoreHasValue({ score }))
+      matchUpIdsWithScoreValue.push(matchUpId);
+    return matchUpIds.includes(matchUpId);
+  }) ?? [];
   const matchUpIdsToDelete = matchUpsToDelete.map(
     extractAttributes("matchUpId")
   );
@@ -44109,15 +44129,40 @@ function deleteAdHocMatchUps$1({
     );
     const missingRoundNumbers = getMissingSequenceNumbers(roundNumbers);
     if (missingRoundNumbers.length) {
-      const roundNumbersToConsider = missingRoundNumbers.reverse();
-      for (const roundNumber of roundNumbersToConsider) {
+      missingRoundNumbers.reverse();
+      for (const roundNumber of missingRoundNumbers) {
         structure.matchUps.forEach((matchUp) => {
           if (matchUp.roundNumber && matchUp.roundNumber > roundNumber) {
             matchUp.roundNumber -= 1;
+            modifyMatchUpNotice({
+              tournamentId: tournamentRecord?.tournamentId,
+              context: ["adHoc round deletion"],
+              eventId: event?.eventId,
+              drawDefinition,
+              matchUp
+            });
           }
         });
       }
     }
+    if (matchUpIdsWithScoreValue.length) {
+      structure.positionAssignments = unique(
+        structure.matchUps.flatMap(
+          (matchUp) => (matchUp.sides ?? []).map((side) => side.participantId)
+        ).filter(Boolean)
+      ).map((participantId) => ({ participantId }));
+      const matchUpFormat = structure?.matchUpFormat ?? drawDefinition?.matchUpFormat ?? event?.matchUpFormat;
+      const result = updateAssignmentParticipantResults({
+        positionAssignments: structure.positionAssignments,
+        matchUps: structure.matchUps,
+        tournamentRecord,
+        drawDefinition,
+        matchUpFormat,
+        event
+      });
+      if (result.error)
+        console.log(result);
+    }
     modifyDrawNotice({
       structureIds: [structureId],
       eventId: event?.eventId,
@@ -44287,6 +44332,13 @@ function generateAdHocMatchUps$1({
     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" };
   }
@@ -57935,6 +57987,7 @@ const eventGovernor = {
   renameStructures,
   disableTieAutoCalc,
   enableTieAutoCalc,
+  validateCollectionDefinition,
   modifyCollectionDefinition: modifyCollectionDefinition$1,
   orderCollectionDefinitions: orderCollectionDefinitions$1,
   removeCollectionDefinition: removeCollectionDefinition$1,
@@ -60522,7 +60575,7 @@ function anonymizeTournamentRecord({
   idMap[tournamentRecord.tournamentId] = newTournamentId;
   tournamentRecord.tournamentId = newTournamentId;
   tournamentRecord.createdAt = (/* @__PURE__ */ new Date()).toISOString();
-  tournamentRecord.tournamentName = tournamentName || `Anonymized: ${formatDate( new Date())}`;
+  tournamentRecord.tournamentName = tournamentName || `Anonymized: ${formatDate(/* @__PURE__ */ new Date())}`;
   delete tournamentRecord.parentOrganisation;
   for (const participant of tournamentRecord.participants || []) {
     const newParticipantId = UUID();