tods-competition-factory 1.6.28 → 1.6.29

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.6.28';
+    return '1.6.29';
 }
 
 /******************************************************************************
@@ -43348,9 +43348,11 @@ function processPlayoffGroups(_a) {
             finishingPositions
                 .map(function (p) { var _a; return (_a = positionRangeMap[p]) === null || _a === void 0 ? void 0 : _a.finishingPositions; })
                 .flat();
-        var playoffDrawType = playoffGroup.drawType || SINGLE_ELIMINATION;
         var participantsInDraw = groupCount * finishingPositions.length;
         var drawSize = nextPowerOf2(participantsInDraw);
+        var playoffDrawType = (drawSize === 2 && SINGLE_ELIMINATION) ||
+            playoffGroup.drawType ||
+            SINGLE_ELIMINATION;
         if (positionsPlayedOff) {
             finishingPositionOffset = Math.min.apply(Math, __spreadArray([], __read(positionsPlayedOff), false)) - 1;
         }
@@ -43933,15 +43935,19 @@ function getGenerators(params) {
 
 function generateDrawStructuresAndLinks$1(params) {
     var e_1, _a, e_2, _b;
-    var _c, _d, _e, _f, _g, _h, _j;
-    var _k = params || {}, _l = _k.enforceMinimumDrawSize, enforceMinimumDrawSize = _l === void 0 ? true : _l, overwriteExisting = _k.overwriteExisting, drawTypeCoercion = _k.drawTypeCoercion, // coerce to SINGLE_ELIMINATION for drawSize: 2
-    appliedPolicies = _k.appliedPolicies, staggeredEntry = _k.staggeredEntry, // optional - specifies main structure FEED_IN for drawTypes CURTIS_CONSOLATION, FEED_IN_CHAMPIONSHIPS, FMLC
-    drawDefinition = _k.drawDefinition, tieFormat = _k.tieFormat, drawSize = _k.drawSize, isMock = _k.isMock, uuids = _k.uuids;
+    var _c, _d, _e, _f, _g, _h;
+    var _j = params || {}, _k = _j.enforceMinimumDrawSize, enforceMinimumDrawSize = _k === void 0 ? true : _k, _l = _j.drawTypeCoercion, drawTypeCoercion = _l === void 0 ? true : _l, // coerce to SINGLE_ELIMINATION for drawSize: 2
+    overwriteExisting = _j.overwriteExisting, appliedPolicies = _j.appliedPolicies, staggeredEntry = _j.staggeredEntry, // optional - specifies main structure FEED_IN for drawTypes CURTIS_CONSOLATION, FEED_IN_CHAMPIONSHIPS, FMLC
+    drawDefinition = _j.drawDefinition, tieFormat = _j.tieFormat, drawSize = _j.drawSize, isMock = _j.isMock, uuids = _j.uuids;
     var stack = 'generateDrawStructuresAndLinks';
-    var drawType = (_c = params.drawType) !== null && _c !== void 0 ? _c : SINGLE_ELIMINATION;
+    var drawType = (drawTypeCoercion &&
+        params.drawSize === 2 &&
+        DrawTypeEnum.SingleElimination) ||
+        params.drawType ||
+        DrawTypeEnum.SingleElimination;
     var structures = [], links = [];
-    var matchUpType = (_d = params === null || params === void 0 ? void 0 : params.matchUpType) !== null && _d !== void 0 ? _d : SINGLES$1;
-    var existingQualifyingStructures = (_e = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _e === void 0 ? void 0 : _e.filter(function (_a) {
+    var matchUpType = (_c = params === null || params === void 0 ? void 0 : params.matchUpType) !== null && _c !== void 0 ? _c : SINGLES$1;
+    var existingQualifyingStructures = (_d = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _d === void 0 ? void 0 : _d.filter(function (_a) {
         var stage = _a.stage;
         return stage === QUALIFYING;
     });
@@ -43952,11 +43958,11 @@ function generateDrawStructuresAndLinks$1(params) {
         var structureId = _a.structureId;
         return structureId;
     });
-    var existingMainStructure = (_f = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _f === void 0 ? void 0 : _f.find(function (_a) {
+    var existingMainStructure = (_e = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _e === void 0 ? void 0 : _e.find(function (_a) {
         var stage = _a.stage, stageSequence = _a.stageSequence;
         return stage === MAIN && stageSequence === 1;
     });
-    var existingQualifyingLinks = (_g = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.links) === null || _g === void 0 ? void 0 : _g.filter(function (link) {
+    var existingQualifyingLinks = (_f = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.links) === null || _f === void 0 ? void 0 : _f.filter(function (link) {
         return link.target.structureId === (existingMainStructure === null || existingMainStructure === void 0 ? void 0 : existingMainStructure.structureId) &&
             (existingQualifyingStructureIds === null || existingQualifyingStructureIds === void 0 ? void 0 : existingQualifyingStructureIds.includes(link.source.structureId));
     });
@@ -43991,7 +43997,7 @@ function generateDrawStructuresAndLinks$1(params) {
         var structure = existingQualifyingStructures === null || existingQualifyingStructures === void 0 ? void 0 : existingQualifyingStructures.find(function (structure) { return structure.structureId === qualifyingStructureId; });
         return getQualifiersCount(link, structure);
     }).filter(Boolean).reduce(function (a, b) { return a + b; }, 0);
-    var mainStructureIsPlaceholder = !!(existingMainStructure && !((_h = existingMainStructure === null || existingMainStructure === void 0 ? void 0 : existingMainStructure.matchUps) === null || _h === void 0 ? void 0 : _h.length));
+    var mainStructureIsPlaceholder = !!(existingMainStructure && !((_g = existingMainStructure === null || existingMainStructure === void 0 ? void 0 : existingMainStructure.matchUps) === null || _g === void 0 ? void 0 : _g.length));
     if ((existingQualifyingStructures === null || existingQualifyingStructures === void 0 ? void 0 : existingQualifyingStructures.length) && !mainStructureIsPlaceholder) {
         return { error: EXISTING_STAGE };
     }
@@ -44116,14 +44122,14 @@ function generateDrawStructuresAndLinks$1(params) {
             var qualifyingDetail = _q.value;
             var qualifyingRoundNumber = qualifyingDetail.finalQualifyingRoundNumber, qualifyingStructureId = qualifyingDetail.finalQualifyingStructureId, targetEntryRound = qualifyingDetail.roundTarget, finishingPositions = qualifyingDetail.finishingPositions, linkType = qualifyingDetail.linkType;
             var link = mainStructure &&
-                ((_j = generateQualifyingLink({
+                ((_h = generateQualifyingLink({
                     targetStructureId: mainStructure.structureId,
                     sourceStructureId: qualifyingStructureId,
                     sourceRoundNumber: qualifyingRoundNumber,
                     finishingPositions: finishingPositions,
                     targetEntryRound: targetEntryRound,
                     linkType: linkType,
-                })) === null || _j === void 0 ? void 0 : _j.link);
+                })) === null || _h === void 0 ? void 0 : _h.link);
             if (link === null || link === void 0 ? void 0 : link.error)
                 return link;
             if (link) {
@@ -59356,7 +59362,8 @@ function addEventEntryPairs(_a) {
 }
 
 function checkValidEntries(_a) {
-    var _b = _a.enforceGender, enforceGender = _b === void 0 ? true : _b, participants = _a.participants, event = _a.event;
+    var _b = _a.enforceGender, enforceGender = _b === void 0 ? true : _b, consideredEntries = _a.consideredEntries, tournamentRecord = _a.tournamentRecord, participants = _a.participants, event = _a.event;
+    participants = participants || (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants);
     if (!participants)
         return { error: MISSING_PARTICIPANTS };
     if (!Array.isArray(participants))
@@ -59367,7 +59374,7 @@ function checkValidEntries(_a) {
     var participantType = (eventType === TEAM_EVENT && TEAM) ||
         (eventType === DOUBLES_EVENT && PAIR) ||
         INDIVIDUAL;
-    var entryStatusMap = Object.assign.apply(Object, __spreadArray([{}], __read((event.entries || []).map(function (entry) {
+    var entryStatusMap = Object.assign.apply(Object, __spreadArray([{}], __read((consideredEntries || event.entries || []).map(function (entry) {
         var _a;
         return (_a = {},
             _a[entry.participantId] = entry.entryStatus,
@@ -62181,8 +62188,14 @@ function generateDrawDefinition(params) {
     var e_1, _a, e_2, _b, e_3, _c, e_4, _d, _e, e_5, _f, e_6, _g, _h;
     var _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
     var stack = 'generateDrawDefinition';
-    var _22 = params.drawType, drawType = _22 === void 0 ? DrawTypeEnum.SingleElimination : _22, _23 = params.considerEventEntries, considerEventEntries = _23 === void 0 ? true : _23, // in the absence of drawSize and drawEntries, look to event.entries
-    ignoreAllowedDrawTypes = params.ignoreAllowedDrawTypes, voluntaryConsolation = params.voluntaryConsolation, hydrateCollections = params.hydrateCollections, policyDefinitions = params.policyDefinitions, ignoreStageSpace = params.ignoreStageSpace, tournamentRecord = params.tournamentRecord, qualifyingOnly = params.qualifyingOnly, tieFormatName = params.tieFormatName, drawEntries = params.drawEntries, addToEvent = params.addToEvent, placeByes = params.placeByes, event = params.event;
+    var _22 = params.considerEventEntries, considerEventEntries = _22 === void 0 ? true : _22, // in the absence of drawSize and drawEntries, look to event.entries
+    _23 = params.drawTypeCoercion, // in the absence of drawSize and drawEntries, look to event.entries
+    drawTypeCoercion = _23 === void 0 ? true : _23, ignoreAllowedDrawTypes = params.ignoreAllowedDrawTypes, voluntaryConsolation = params.voluntaryConsolation, hydrateCollections = params.hydrateCollections, policyDefinitions = params.policyDefinitions, ignoreStageSpace = params.ignoreStageSpace, tournamentRecord = params.tournamentRecord, qualifyingOnly = params.qualifyingOnly, tieFormatName = params.tieFormatName, drawEntries = params.drawEntries, addToEvent = params.addToEvent, placeByes = params.placeByes, event = params.event;
+    var drawType = (drawTypeCoercion &&
+        params.drawSize === 2 &&
+        DrawTypeEnum.SingleElimination) ||
+        params.drawType ||
+        DrawTypeEnum.SingleElimination;
     // get participants both for entry validation and for automated placement
     // automated placement requires them to be "inContext" for avoidance policies to work
     var participants = getTournamentParticipants({
@@ -62194,13 +62207,6 @@ function generateDrawDefinition(params) {
         event: event,
     }).appliedPolicies) !== null && _j !== void 0 ? _j : {};
     var enforceGender = (_o = (_k = params.enforceGender) !== null && _k !== void 0 ? _k : (_m = (_l = policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_MATCHUP_ACTIONS]) === null || _l === void 0 ? void 0 : _l.participants) === null || _m === void 0 ? void 0 : _m.enforceGender) !== null && _o !== void 0 ? _o : (_q = (_p = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) === null || _p === void 0 ? void 0 : _p.participants) === null || _q === void 0 ? void 0 : _q.enforceGender;
-    // entries participantTypes must correspond with eventType
-    // this is only possible if the event is provided
-    var validEntriesResult = event &&
-        participants &&
-        checkValidEntries({ event: event, participants: participants, enforceGender: enforceGender });
-    if (validEntriesResult === null || validEntriesResult === void 0 ? void 0 : validEntriesResult.error)
-        return decorateResult({ result: validEntriesResult, stack: stack });
     // if tournamentRecord is provided, and unless instructed to ignore valid types,
     // check for restrictions on allowed drawTypes
     var allowedDrawTypes = !ignoreAllowedDrawTypes &&
@@ -62223,6 +62229,18 @@ function generateDrawDefinition(params) {
         var entryStage = _a.entryStage;
         return !entryStage || entryStage === MAIN;
     });
+    // entries participantTypes must correspond with eventType
+    // this is only possible if the event is provided
+    var validEntriesResult = event &&
+        participants &&
+        checkValidEntries({
+            consideredEntries: consideredEntries,
+            enforceGender: enforceGender,
+            participants: participants,
+            event: event,
+        });
+    if (validEntriesResult === null || validEntriesResult === void 0 ? void 0 : validEntriesResult.error)
+        return decorateResult({ result: validEntriesResult, stack: stack });
     var derivedDrawSize = !params.drawSize &&
         consideredEntries.length &&
         ![