tods-competition-factory 1.6.10 → 1.6.11

package/dist/forge/generate.mjs

@@ -3185,7 +3185,7 @@ function structureSort(a, b, config) {
   const completedStructure = (s) => s?.matchUps.every(
     ({ matchUpStatus }) => completedMatchUpStatuses.includes(matchUpStatus) ? 1 : -1
   );
-  return completed && completedStructure(a) - completedStructure(b) || aggregate && protocolSequence(a) - protocolSequence(b) || (a?.stage && orderProtocol[a.stage] || 0) - (b?.stage && orderProtocol[b.stage] || 0) || (getRoundTarget(a) || 0) - (getRoundTarget(b) || 0) || !finish && !aggregate && (b?.positionAssignments?.length || Infinity) - (a?.positionAssignments?.length || Infinity) || (a?.stageSequence || 0) - (b?.stageSequence || 0) || (getMinFinishingPositionRange(a) || 0) - (getMinFinishingPositionRange(b) || 0);
+  return completed && completedStructure(a) - completedStructure(b) || aggregate && protocolSequence(a) - protocolSequence(b) || (a?.stage && orderProtocol[a.stage] || 0) - (b?.stage && orderProtocol[b.stage] || 0) || (getRoundTarget(a) || 0) - (getRoundTarget(b) || 0) || !finish && !aggregate && (b?.positionAssignments?.length ?? Infinity) - (a?.positionAssignments?.length ?? Infinity) || (a?.stageSequence ?? 0) - (b?.stageSequence ?? 0) || (getMinFinishingPositionRange(a) || 0) - (getMinFinishingPositionRange(b) || 0);
 }
 function getMinFinishingPositionRange(structure) {
   return (structure?.matchUps || []).reduce((rangeSum, matchUp) => {
@@ -3327,6 +3327,7 @@ function getStageEntryTypeCount({ stage, drawDefinition, entryStatus }) {
 }
 function getStageEntries({
   provisionalPositioning,
+  placementGroup,
   drawDefinition,
   stageSequence,
   entryStatuses,
@@ -3356,7 +3357,9 @@ function getStageEntries({
     if (error) {
       console.log("playoff entries error");
     }
-    return playoffEntries?.length ? playoffEntries : entries;
+    return (playoffEntries?.length ? playoffEntries : entries).filter(
+      (entry) => !placementGroup || entry.placementGroup === placementGroup
+    );
   }
   return entries;
 }
@@ -12805,6 +12808,7 @@ function automatedPositioning$1({
   placeByes = true,
   tournamentRecord,
   appliedPolicies,
+  placementGroup,
   drawDefinition,
   seedingProfile,
   participants,
@@ -12856,6 +12860,7 @@ function automatedPositioning$1({
     stageSequence: structure.stageSequence,
     provisionalPositioning,
     stage: structure.stage,
+    placementGroup,
     drawDefinition,
     entryStatuses,
     structureId
@@ -13103,10 +13108,12 @@ function automatedPlayoffPositioning(params) {
   if (!structureIsComplete && !provisionalPositioning) {
     return { error: INCOMPLETE_SOURCE_STRUCTURE };
   }
-  const { playoffStructures } = getPlayoffStructures({
+  const playoffStructures = getPlayoffStructures({
     drawDefinition,
     structureId
-  });
+  }).playoffStructures?.sort(
+    (a, b) => getMinFinishingPositionRange(a) - getMinFinishingPositionRange(b)
+  );
   const structurePositionAssignments = [];
   const participants = tournamentRecord?.participants;
   if (playoffStructures) {
@@ -14337,10 +14344,10 @@ function processPlayoffGroups({
       finishingPositionOffset = Math.min(...positionsPlayedOff) - 1;
     }
     const params = {
+      structureId: playoffGroup.structureId ?? uuids?.pop(),
       structureName: playoffGroup.structureName,
       idPrefix: idPrefix && `${idPrefix}-po`,
       appliedPolicies: policyDefinitions,
-      structureId: uuids?.pop(),
       finishingPositionOffset,
       stage: PLAY_OFF,
       stageSequence,
@@ -14376,9 +14383,9 @@ function processPlayoffGroups({
         uuids
       });
       const playoffStructure = structureTemplate({
+        structureId: playoffGroup.structureId ?? uuids?.pop(),
         structureName: playoffGroup.structureName,
         matchUpFormat: playoffMatchUpFormat,
-        structureId: uuids?.pop(),
         stage: PLAY_OFF,
         stageSequence,
         matchUps
@@ -14398,6 +14405,7 @@ function processPlayoffGroups({
     } else if ([COMPASS, OLYMPIC, PLAY_OFF].includes(playoffDrawType)) {
       const { structureName } = playoffGroup;
       const params2 = {
+        structureId: playoffGroup.structureId ?? uuids?.pop(),
         playoffStructureNameBase: structureName,
         idPrefix: idPrefix && `${idPrefix}-po`,
         addNameBaseToAttributeName: true,
@@ -14451,6 +14459,7 @@ function processPlayoffGroups({
     ].includes(playoffDrawType)) {
       const uuidsFMLC = [uuids?.pop(), uuids?.pop()];
       const params2 = {
+        structureId: playoffGroup.structureId ?? uuids?.pop(),
         structureName: playoffGroup.structureName,
         idPrefix: idPrefix && `${idPrefix}-po`,
         finishingPositionOffset,
@@ -14498,9 +14507,9 @@ function processPlayoffGroups({
       updateStructureAndLinks({ playoffStructures, playoffLinks });
     } else if ([AD_HOC].includes(playoffDrawType)) {
       const structure = structureTemplate({
+        structureId: playoffGroup.structureId ?? uuids?.pop(),
         structureName: playoffGroup.structureName,
         finishingPosition: WIN_RATIO$1,
-        structureId: uuids?.pop(),
         stage: PLAY_OFF,
         stageSequence,
         matchUps: []
@@ -14682,6 +14691,7 @@ function addNotes(params) {
 }
 
 const FORMAT_STANDARD = "SET3-S:6/TB7";
+const FORMAT_ATP_DOUBLES = "SET3-S:6/TB7-F:TB10";
 
 function countSets({
   winningSide: matchUpWinningSide,
@@ -17202,9 +17212,9 @@ function generateAndPopulatePlayoffStructures(params) {
     structureId: sourceStructureId,
     addNameBaseToAttributeName,
     playoffStructureNameBase,
-    tournamentRecord,
     playoffAttributes,
     playoffPositions,
+    tournamentRecord,
     exitProfileLimit,
     roundProfiles,
     roundNumbers,
@@ -17279,7 +17289,7 @@ function generateAndPopulatePlayoffStructures(params) {
   const roundsRanges = validRoundNumbers ? availablePlayoffRoundsRanges : playoffRoundsRanges;
   const newStructures = [];
   const newLinks = [];
-  for (const roundNumber of sourceRounds || []) {
+  for (const roundNumber of sourceRounds ?? []) {
     const roundInfo = roundsRanges?.find(
       (roundInfo2) => roundInfo2.roundNumber === roundNumber
     );
@@ -20275,6 +20285,124 @@ function addDrawDefinition(params) {
   return { ...SUCCESS, modifiedEventEntryStatusCount };
 }
 
+function generateAdHocMatchUps({
+  participantIdPairings,
+  addToStructure = true,
+  tournamentRecord,
+  matchUpIds = [],
+  drawDefinition,
+  matchUpsCount,
+  roundNumber,
+  structureId,
+  newRound
+}) {
+  if (typeof drawDefinition !== "object")
+    return { error: MISSING_DRAW_DEFINITION };
+  if (!structureId && drawDefinition.structures?.length === 1)
+    structureId = drawDefinition.structures?.[0]?.structureId;
+  if (typeof structureId !== "string")
+    return { error: MISSING_STRUCTURE_ID };
+  if (participantIdPairings && !Array.isArray(participantIdPairings) || matchUpsCount && !isConvertableInteger(matchUpsCount) || matchUpIds && !Array.isArray(matchUpIds) || !participantIdPairings && !matchUpsCount) {
+    return { error: INVALID_VALUES, info: "matchUpsCount or pairings error" };
+  }
+  const structure = drawDefinition?.structures?.find(
+    (structure2) => structure2.structureId === structureId
+  );
+  let structureHasRoundPositions;
+  const existingMatchUps = structure?.matchUps;
+  const lastRoundNumber = existingMatchUps?.reduce(
+    (roundNumber2, matchUp) => {
+      if (matchUp.roundPosition)
+        structureHasRoundPositions = true;
+      return (matchUp?.roundNumber || 0) > roundNumber2 ? matchUp.roundNumber : roundNumber2;
+    },
+    0
+  );
+  if (structure?.structures || structureHasRoundPositions || structure?.finishingPosition === ROUND_OUTCOME) {
+    return { error: INVALID_STRUCTURE };
+  }
+  if (roundNumber && roundNumber - 1 > (lastRoundNumber || 0))
+    return { error: INVALID_VALUES, info: "roundNumber error" };
+  const nextRoundNumber = roundNumber ?? (newRound ? (lastRoundNumber ?? 0) + 1 : lastRoundNumber ?? 1);
+  participantIdPairings = participantIdPairings ?? generateRange(0, matchUpsCount).map(() => ({
+    participantIds: [void 0, void 0]
+  }));
+  const matchUps = participantIdPairings?.map((pairing) => {
+    const idStack = pairing?.participantIds ?? [void 0, void 0];
+    idStack.push(...[void 0, void 0]);
+    const participantIds = idStack.slice(0, 2);
+    const sides = participantIds.map(
+      (participantId, i) => definedAttributes({
+        sideNumber: i + 1,
+        participantId
+      })
+    );
+    return {
+      matchUpStatus: MatchUpStatusEnum.ToBePlayed,
+      matchUpId: matchUpIds.pop() ?? UUID(),
+      roundNumber: nextRoundNumber,
+      sides
+    };
+  });
+  if (addToStructure) {
+    const result = addAdHocMatchUps({
+      tournamentRecord,
+      drawDefinition,
+      structureId,
+      matchUps
+    });
+    if (result.error)
+      return result;
+  }
+  return { matchUpsCount: matchUps.length, matchUps, ...SUCCESS };
+}
+function addAdHocMatchUps({
+  tournamentRecord,
+  drawDefinition,
+  structureId,
+  matchUps
+}) {
+  if (typeof drawDefinition !== "object")
+    return { error: MISSING_DRAW_DEFINITION };
+  if (!structureId && drawDefinition.structures?.length === 1)
+    structureId = drawDefinition.structures?.[0]?.structureId;
+  if (typeof structureId !== "string")
+    return { error: MISSING_STRUCTURE_ID };
+  if (!validMatchUps(matchUps))
+    return { error: INVALID_VALUES, info: mustBeAnArray("matchUps") };
+  const structure = drawDefinition.structures?.find(
+    (structure2) => structure2.structureId === structureId
+  );
+  if (!structure)
+    return { error: STRUCTURE_NOT_FOUND };
+  const existingMatchUps = structure?.matchUps;
+  const structureHasRoundPositions = existingMatchUps.find(
+    (matchUp) => !!matchUp.roundPosition
+  );
+  if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
+    return { error: INVALID_STRUCTURE };
+  }
+  const existingMatchUpIds = allTournamentMatchUps({
+    tournamentRecord,
+    inContext: false
+  })?.matchUps?.map(getMatchUpId) ?? [];
+  const newMatchUpIds = matchUps.map(getMatchUpId);
+  if (overlap(existingMatchUpIds, newMatchUpIds)) {
+    return {
+      error: EXISTING_MATCHUP_ID,
+      info: "One or more matchUpIds already present in tournamentRecord"
+    };
+  }
+  structure.matchUps.push(...matchUps);
+  addMatchUpsNotice({
+    tournamentId: tournamentRecord?.tournamentId,
+    drawDefinition,
+    matchUps
+  });
+  modifyDrawNotice({ drawDefinition, structureIds: [structureId] });
+  return { ...SUCCESS };
+}
+
 function attachPolicies({ drawDefinition, policyDefinitions }) {
   if (!drawDefinition) {
     return { error: MISSING_DRAW_DEFINITION };
@@ -20588,124 +20716,6 @@ function pairingHash(id1, id2) {
   return [id1, id2].sort().join("|");
 }
 
-function generateAdHocMatchUps({
-  participantIdPairings,
-  addToStructure = true,
-  tournamentRecord,
-  matchUpIds = [],
-  drawDefinition,
-  matchUpsCount,
-  roundNumber,
-  structureId,
-  newRound
-}) {
-  if (typeof drawDefinition !== "object")
-    return { error: MISSING_DRAW_DEFINITION };
-  if (!structureId && drawDefinition.structures?.length === 1)
-    structureId = drawDefinition.structures?.[0]?.structureId;
-  if (typeof structureId !== "string")
-    return { error: MISSING_STRUCTURE_ID };
-  if (participantIdPairings && !Array.isArray(participantIdPairings) || matchUpsCount && !isConvertableInteger(matchUpsCount) || matchUpIds && !Array.isArray(matchUpIds) || !participantIdPairings && !matchUpsCount) {
-    return { error: INVALID_VALUES, info: "matchUpsCount or pairings error" };
-  }
-  const structure = drawDefinition?.structures?.find(
-    (structure2) => structure2.structureId === structureId
-  );
-  let structureHasRoundPositions;
-  const existingMatchUps = structure?.matchUps;
-  const lastRoundNumber = existingMatchUps?.reduce(
-    (roundNumber2, matchUp) => {
-      if (matchUp.roundPosition)
-        structureHasRoundPositions = true;
-      return (matchUp?.roundNumber || 0) > roundNumber2 ? matchUp.roundNumber : roundNumber2;
-    },
-    0
-  );
-  if (structure?.structures || structureHasRoundPositions || structure?.finishingPosition === ROUND_OUTCOME) {
-    return { error: INVALID_STRUCTURE };
-  }
-  if (roundNumber && roundNumber - 1 > (lastRoundNumber || 0))
-    return { error: INVALID_VALUES, info: "roundNumber error" };
-  const nextRoundNumber = roundNumber ?? (newRound ? (lastRoundNumber ?? 0) + 1 : lastRoundNumber ?? 1);
-  participantIdPairings = participantIdPairings ?? generateRange(0, matchUpsCount).map(() => ({
-    participantIds: [void 0, void 0]
-  }));
-  const matchUps = participantIdPairings?.map((pairing) => {
-    const idStack = pairing?.participantIds ?? [void 0, void 0];
-    idStack.push(...[void 0, void 0]);
-    const participantIds = idStack.slice(0, 2);
-    const sides = participantIds.map(
-      (participantId, i) => definedAttributes({
-        sideNumber: i + 1,
-        participantId
-      })
-    );
-    return {
-      matchUpStatus: MatchUpStatusEnum.ToBePlayed,
-      matchUpId: matchUpIds.pop() ?? UUID(),
-      roundNumber: nextRoundNumber,
-      sides
-    };
-  });
-  if (addToStructure) {
-    const result = addAdHocMatchUps({
-      tournamentRecord,
-      drawDefinition,
-      structureId,
-      matchUps
-    });
-    if (result.error)
-      return result;
-  }
-  return { matchUpsCount: matchUps.length, matchUps, ...SUCCESS };
-}
-function addAdHocMatchUps({
-  tournamentRecord,
-  drawDefinition,
-  structureId,
-  matchUps
-}) {
-  if (typeof drawDefinition !== "object")
-    return { error: MISSING_DRAW_DEFINITION };
-  if (!structureId && drawDefinition.structures?.length === 1)
-    structureId = drawDefinition.structures?.[0]?.structureId;
-  if (typeof structureId !== "string")
-    return { error: MISSING_STRUCTURE_ID };
-  if (!validMatchUps(matchUps))
-    return { error: INVALID_VALUES, info: mustBeAnArray("matchUps") };
-  const structure = drawDefinition.structures?.find(
-    (structure2) => structure2.structureId === structureId
-  );
-  if (!structure)
-    return { error: STRUCTURE_NOT_FOUND };
-  const existingMatchUps = structure?.matchUps;
-  const structureHasRoundPositions = existingMatchUps.find(
-    (matchUp) => !!matchUp.roundPosition
-  );
-  if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
-    return { error: INVALID_STRUCTURE };
-  }
-  const existingMatchUpIds = allTournamentMatchUps({
-    tournamentRecord,
-    inContext: false
-  })?.matchUps?.map(getMatchUpId) ?? [];
-  const newMatchUpIds = matchUps.map(getMatchUpId);
-  if (overlap(existingMatchUpIds, newMatchUpIds)) {
-    return {
-      error: EXISTING_MATCHUP_ID,
-      info: "One or more matchUpIds already present in tournamentRecord"
-    };
-  }
-  structure.matchUps.push(...matchUps);
-  addMatchUpsNotice({
-    tournamentId: tournamentRecord?.tournamentId,
-    drawDefinition,
-    matchUps
-  });
-  modifyDrawNotice({ drawDefinition, structureIds: [structureId] });
-  return { ...SUCCESS };
-}
-
 const ENCOUNTER_VALUE = 50;
 const SAME_TEAM_VALUE = 60;
 const DEFAULT_RATING = 0;
@@ -21963,7 +21973,6 @@ const USTA_TOC = "USTA_TOC";
 const USTA_WTT_ITT = "USTA_WTT_ITT";
 const USTA_ZONAL = "USTA_ZONAL";
 
-const bestOf3tbSets = "SET3-S:6/TB7";
 const STANDARD = "STANDARD";
 const namedFormats = {
   [STANDARD]: {
@@ -21980,9 +21989,9 @@ const namedFormats = {
       matchUpFormat: "SET1-S:8/TB7@7"
     },
     singles: {
+      matchUpFormat: FORMAT_STANDARD,
       matchUpCount: 6,
-      matchUpValue: 1,
-      matchUpFormat: bestOf3tbSets
+      matchUpValue: 1
     },
     tieFormatName: COLLEGE_D3,
     valueGoal: 5
@@ -21992,12 +22001,12 @@ const namedFormats = {
     doubles: {
       matchUpCount: 3,
       collectionValue: 1,
-      matchUpFormat: bestOf3tbSets
+      matchUpFormat: FORMAT_STANDARD
     },
     singles: {
       matchUpCount: 6,
       matchUpValue: 1,
-      matchUpFormat: bestOf3tbSets
+      matchUpFormat: FORMAT_STANDARD
     },
     tieFormatName: COLLEGE_DEFAULT,
     valueGoal: 4
@@ -22012,7 +22021,7 @@ const namedFormats = {
     singles: {
       matchUpCount: 6,
       matchUpValue: 1,
-      matchUpFormat: bestOf3tbSets
+      matchUpFormat: FORMAT_STANDARD
     },
     tieFormatName: COLLEGE_JUCO,
     valueGoal: 5
@@ -22052,7 +22061,7 @@ const tieFormatDefaults = (params) => {
       collectionDefinitions: [
         {
           collectionId: uuids?.pop() || UUID(),
-          matchUpFormat: "SET3-S:6/TB7-F:TB10",
+          matchUpFormat: FORMAT_ATP_DOUBLES,
           matchUpType: TypeEnum.Doubles,
           collectionName: "Doubles",
           ...template.doubles
@@ -22060,7 +22069,7 @@ const tieFormatDefaults = (params) => {
         {
           collectionId: uuids?.pop() || UUID(),
           matchUpType: TypeEnum.Singles,
-          matchUpFormat: bestOf3tbSets,
+          matchUpFormat: FORMAT_STANDARD,
           collectionName: "Singles",
           ...template.singles
         }
@@ -22568,7 +22577,7 @@ function generateDrawDefinition(params) {
   } else if (!matchUpFormat) {
     tieFormat = void 0;
     if (!event?.matchUpFormat) {
-      matchUpFormat = "SET3-S:6/TB7";
+      matchUpFormat = FORMAT_STANDARD;
     }
   }
   const invalidDrawId = params.drawId && typeof params.drawId !== "string";