tods-competition-factory 1.6.28 → 1.6.29

package/dist/index.mjs

@@ -329,7 +329,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.6.28";
+  return "1.6.29";
 }
 
 function getObjectTieFormat(obj) {
@@ -40001,9 +40001,9 @@ function processPlayoffGroups({
   for (const playoffGroup of playoffGroups) {
     const finishingPositions = playoffGroup.finishingPositions;
     const positionsPlayedOff = positionRangeMap && finishingPositions.map((p) => positionRangeMap[p]?.finishingPositions).flat();
-    const playoffDrawType = playoffGroup.drawType || SINGLE_ELIMINATION;
     const participantsInDraw = groupCount * finishingPositions.length;
     const drawSize = nextPowerOf2(participantsInDraw);
+    const playoffDrawType = drawSize === 2 && SINGLE_ELIMINATION || playoffGroup.drawType || SINGLE_ELIMINATION;
     if (positionsPlayedOff) {
       finishingPositionOffset = Math.min(...positionsPlayedOff) - 1;
     }
@@ -40570,9 +40570,9 @@ function getGenerators(params) {
 function generateDrawStructuresAndLinks$1(params) {
   const {
     enforceMinimumDrawSize = true,
-    overwriteExisting,
-    drawTypeCoercion,
+    drawTypeCoercion = true,
     // coerce to SINGLE_ELIMINATION for drawSize: 2
+    overwriteExisting,
     appliedPolicies,
     staggeredEntry,
     // optional - specifies main structure FEED_IN for drawTypes CURTIS_CONSOLATION, FEED_IN_CHAMPIONSHIPS, FMLC
@@ -40583,7 +40583,7 @@ function generateDrawStructuresAndLinks$1(params) {
     uuids
   } = params || {};
   const stack = "generateDrawStructuresAndLinks";
-  let drawType = params.drawType ?? SINGLE_ELIMINATION;
+  let drawType = drawTypeCoercion && params.drawSize === 2 && DrawTypeEnum.SingleElimination || params.drawType || DrawTypeEnum.SingleElimination;
   const structures = [], links = [];
   const matchUpType = params?.matchUpType ?? SINGLES$1;
   const existingQualifyingStructures = drawDefinition?.structures?.filter(
@@ -54732,9 +54732,12 @@ function addEventEntryPairs({
 
 function checkValidEntries({
   enforceGender = true,
+  consideredEntries,
+  tournamentRecord,
   participants,
   event
 }) {
+  participants = participants || tournamentRecord?.participants;
   if (!participants)
     return { error: MISSING_PARTICIPANTS };
   if (!Array.isArray(participants))
@@ -54745,7 +54748,7 @@ function checkValidEntries({
   const participantType = eventType === TEAM_EVENT && TEAM || eventType === DOUBLES_EVENT && PAIR || INDIVIDUAL;
   const entryStatusMap = Object.assign(
     {},
-    ...(event.entries || []).map((entry) => ({
+    ...(consideredEntries || event.entries || []).map((entry) => ({
       [entry.participantId]: entry.entryStatus
     }))
   );
@@ -57338,9 +57341,9 @@ function prepareStage(params) {
 function generateDrawDefinition(params) {
   const stack = "generateDrawDefinition";
   const {
-    drawType = DrawTypeEnum.SingleElimination,
     considerEventEntries = true,
     // in the absence of drawSize and drawEntries, look to event.entries
+    drawTypeCoercion = true,
     ignoreAllowedDrawTypes,
     voluntaryConsolation,
     hydrateCollections,
@@ -57354,6 +57357,7 @@ function generateDrawDefinition(params) {
     placeByes,
     event
   } = params;
+  const drawType = drawTypeCoercion && params.drawSize === 2 && DrawTypeEnum.SingleElimination || params.drawType || DrawTypeEnum.SingleElimination;
   const { tournamentParticipants: participants } = getTournamentParticipants({
     tournamentRecord,
     inContext: true
@@ -57363,9 +57367,6 @@ function generateDrawDefinition(params) {
     event
   }).appliedPolicies ?? {};
   const enforceGender = params.enforceGender ?? policyDefinitions?.[POLICY_TYPE_MATCHUP_ACTIONS]?.participants?.enforceGender ?? appliedPolicies?.[POLICY_TYPE_MATCHUP_ACTIONS]?.participants?.enforceGender;
-  const validEntriesResult = event && participants && checkValidEntries({ event, participants, enforceGender });
-  if (validEntriesResult?.error)
-    return decorateResult({ result: validEntriesResult, stack });
   const allowedDrawTypes = !ignoreAllowedDrawTypes && tournamentRecord && getAllowedDrawTypes({
     tournamentRecord,
     categoryType: event?.category?.categoryType,
@@ -57378,6 +57379,14 @@ function generateDrawDefinition(params) {
     (entry) => entry.entryStatus && [...STRUCTURE_ENTERED_TYPES, QUALIFIER].includes(entry.entryStatus)
   ) ?? [];
   const consideredEntries = (qualifyingOnly && [] || drawEntries || (considerEventEntries ? eventEntries : [])).filter(({ entryStage }) => !entryStage || entryStage === MAIN);
+  const validEntriesResult = event && participants && checkValidEntries({
+    consideredEntries,
+    enforceGender,
+    participants,
+    event
+  });
+  if (validEntriesResult?.error)
+    return decorateResult({ result: validEntriesResult, stack });
   const derivedDrawSize = !params.drawSize && consideredEntries.length && ![
     AD_HOC,
     DOUBLE_ELIMINATION,