tods-competition-factory 1.6.22 → 1.6.24

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.6.22';
+    return '1.6.24';
 }
 
 /******************************************************************************
@@ -639,6 +639,9 @@ function shuffleArray(arr) {
         .sort(function (a, b) { return a[0] - b[0]; })
         .map(function (a) { return a[1]; });
 }
+function numericSortValue(v) {
+    return isConvertableInteger(v) ? v : Infinity;
+}
 // return an object whose attributes are values and whose values are counts for values
 // e.g. values=[1,2,2,3,4,4,5] produces { 1: 1, 2: 2, 3: 1, 4: 2, 5: 1}
 function instanceCount(values) {
@@ -4827,6 +4830,7 @@ var POLICY_TYPE_PARTICIPANT = 'participant';
 var POLICY_TYPE_PROGRESSION = 'progression';
 var POLICY_TYPE_SCHEDULING = 'scheduling';
 var POLICY_TYPE_AVOIDANCE = 'avoidance';
+var POLICY_TYPE_DISPLAY = 'display'; // storage for client type displays, e.g. { public: {}, admin: {} }
 var POLICY_TYPE_SCORING = 'scoring';
 var POLICY_TYPE_SEEDING = 'seeding';
 var POLICY_TYPE_FEED_IN = 'feedIn';
@@ -4844,6 +4848,7 @@ var policyConstants = {
     POLICY_TYPE_PROGRESSION: POLICY_TYPE_PROGRESSION,
     POLICY_TYPE_SCHEDULING: POLICY_TYPE_SCHEDULING,
     POLICY_TYPE_AVOIDANCE: POLICY_TYPE_AVOIDANCE,
+    POLICY_TYPE_DISPLAY: POLICY_TYPE_DISPLAY,
     POLICY_TYPE_FEED_IN: POLICY_TYPE_FEED_IN,
     POLICY_TYPE_SCORING: POLICY_TYPE_SCORING,
     POLICY_TYPE_SEEDING: POLICY_TYPE_SEEDING,
@@ -10625,15 +10630,15 @@ function targetByRoundOutcome(_a) {
         matchUp: matchUp,
         targetLinks: { loserTargetLink: loserTargetLink, winnerTargetLink: winnerTargetLink, byeTargetLink: byeTargetLink },
         targetMatchUps: {
-            byeMatchUp: byeMatchUp,
-            loserMatchUp: loserMatchUp,
-            winnerMatchUp: winnerMatchUp,
-            byeTargetDrawPosition: byeTargetDrawPosition,
-            loserTargetDrawPosition: loserTargetDrawPosition,
-            winnerTargetDrawPosition: winnerTargetDrawPosition,
-            byeMatchUpDrawPositionIndex: byeMatchUpDrawPositionIndex,
-            loserMatchUpDrawPositionIndex: loserMatchUpDrawPositionIndex,
             winnerMatchUpDrawPositionIndex: winnerMatchUpDrawPositionIndex,
+            loserMatchUpDrawPositionIndex: loserMatchUpDrawPositionIndex,
+            byeMatchUpDrawPositionIndex: byeMatchUpDrawPositionIndex,
+            winnerTargetDrawPosition: winnerTargetDrawPosition,
+            loserTargetDrawPosition: loserTargetDrawPosition,
+            byeTargetDrawPosition: byeTargetDrawPosition,
+            winnerMatchUp: winnerMatchUp,
+            loserMatchUp: loserMatchUp,
+            byeMatchUp: byeMatchUp,
         },
         targetMatchUpIds: !!(winnerMatchUpId || loserMatchUpId),
     });
@@ -10641,9 +10646,9 @@ function targetByRoundOutcome(_a) {
 function targetByWinRatio(_a) {
     var matchUp = _a.matchUp;
     return {
-        matchUp: matchUp,
         targetLinks: { loserTargetLink: undefined, winnerTargetLink: undefined },
         targetMatchUps: { loserMatchUp: undefined, winnerMatchUp: undefined },
+        matchUp: matchUp,
     };
 }
 
@@ -39197,7 +39202,7 @@ function addCourts$1(_a) {
 
 function modifyVenue$1(_a) {
     var e_1, _b;
-    var _c, _d, _e, _f;
+    var _c, _d, _e, _f, _g;
     var tournamentRecord = _a.tournamentRecord, modifications = _a.modifications, venueId = _a.venueId, force = _a.force;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -39225,25 +39230,25 @@ function modifyVenue$1(_a) {
             var _a;
             return Object.assign(venue, (_a = {}, _a[attribute] = modifications[attribute], _a));
         });
-    var existingCourtIds = ((_c = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _c === void 0 ? void 0 : _c.map(function (court) { return court.courtId; })) || [];
-    var courtIdsToModify = ((_d = modifications.courts) === null || _d === void 0 ? void 0 : _d.map(function (court) { return court.courtId; })) || [];
+    var existingCourtIds = (_d = (_c = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _c === void 0 ? void 0 : _c.map(function (court) { return court.courtId; })) !== null && _d !== void 0 ? _d : [];
+    var courtIdsToModify = ((_e = modifications.courts) === null || _e === void 0 ? void 0 : _e.map(function (court) { return court.courtId; })) || [];
     var courtIdsToDelete = existingCourtIds.filter(function (courtId) { return !courtIdsToModify.includes(courtId); });
     if (courtIdsToDelete.length) {
-        var courtsToDelete = (_e = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _e === void 0 ? void 0 : _e.filter(function (court) {
+        var courtsToDelete = (_f = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _f === void 0 ? void 0 : _f.filter(function (court) {
             return courtIdsToDelete.includes(court.courtId);
         });
         var scheduleDeletionsCount = courtsToDelete === null || courtsToDelete === void 0 ? void 0 : courtsToDelete.map(function (court) {
-            var _a;
+            var _a, _b;
             // check whether deleting court would remove schedule from any matchUps
             var result = getScheduledCourtMatchUps({
                 courtId: court.courtId,
                 tournamentRecord: tournamentRecord,
                 venueMatchUps: venueMatchUps,
             });
-            return ((_a = result.matchUps) === null || _a === void 0 ? void 0 : _a.length) || 0;
+            return (_b = (_a = result.matchUps) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
         }).reduce(function (a, b) { return a + b; });
         if (venue && (!scheduleDeletionsCount || force)) {
-            venue.courts = (_f = venue.courts) === null || _f === void 0 ? void 0 : _f.filter(function (court) {
+            venue.courts = (_g = venue.courts) === null || _g === void 0 ? void 0 : _g.filter(function (court) {
                 return courtIdsToModify.includes(court.courtId);
             });
         }
@@ -39255,8 +39260,8 @@ function modifyVenue$1(_a) {
     }
     if (modifications.courts) {
         try {
-            for (var _g = __values(modifications.courts), _h = _g.next(); !_h.done; _h = _g.next()) {
-                var court = _h.value;
+            for (var _h = __values(modifications.courts), _j = _h.next(); !_j.done; _j = _h.next()) {
+                var court = _j.value;
                 var courtId = (court || {}).courtId;
                 var result_1 = modifyCourt$1({
                     modifications: court,
@@ -39281,7 +39286,7 @@ function modifyVenue$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -44836,6 +44841,30 @@ function generateAndPopulatePlayoffStructures(params) {
         if (result.error)
             console.log(result.error);
     });
+    var byeMatchUps = inContextDrawMatchUps === null || inContextDrawMatchUps === void 0 ? void 0 : inContextDrawMatchUps.filter(function (matchUp) {
+        return matchUp.matchUpStatus === BYE && matchUp.structureId === sourceStructureId;
+    });
+    byeMatchUps === null || byeMatchUps === void 0 ? void 0 : byeMatchUps.forEach(function (matchUp) {
+        var matchUpId = matchUp.matchUpId;
+        var targetData = positionTargets({
+            inContextDrawMatchUps: inContextDrawMatchUps,
+            drawDefinition: drawDefinition,
+            matchUpId: matchUpId,
+        });
+        var loserTargetLink = targetData.targetLinks.loserTargetLink, _a = targetData.targetMatchUps, loserMatchUpDrawPositionIndex = _a.loserMatchUpDrawPositionIndex, // only present when positionTargets found without loserMatchUpId
+        loserMatchUp = _a.loserMatchUp;
+        var targetStructureId = loserTargetLink.target.structureId;
+        var targetDrawPosition = loserMatchUp.drawPositions[loserMatchUpDrawPositionIndex];
+        var result = assignDrawPositionBye$1({
+            drawPosition: targetDrawPosition,
+            structureId: targetStructureId,
+            tournamentRecord: tournamentRecord,
+            drawDefinition: drawDefinition,
+            event: event,
+        });
+        if (result.error)
+            console.log(result.error);
+    });
     // the matchUps in the source structure must have goesTo details added
     var matchUpModifications = [];
     var goesToMap = addGoesTo({
@@ -45424,7 +45453,7 @@ function attachStructures$1(_a) {
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     if (!Array.isArray(structures) || !Array.isArray(links))
-        return { error: INVALID_VALUES };
+        return decorateResult({ result: { error: INVALID_VALUES } });
     var stack = 'attachStructures';
     var linkHash = function (link) {
         var _a;
@@ -45636,6 +45665,29 @@ function deleteAdHocMatchUps$1(_a) {
     return __assign({}, SUCCESS);
 }
 
+function setStructureOrder(_a) {
+    var drawDefinition = _a.drawDefinition, orderMap = _a.orderMap;
+    if (!drawDefinition)
+        return { error: MISSING_DRAW_DEFINITION };
+    if (typeof orderMap !== 'object' ||
+        !Object.values(orderMap).every(function (val) { return isConvertableInteger(val); }))
+        decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { orderMap: orderMap },
+        });
+    if (!drawDefinition.structures)
+        drawDefinition.structures = [];
+    drawDefinition.structures.forEach(function (structure) {
+        var structureOrder = orderMap[structure.structureId];
+        if (structureOrder)
+            structure.structureOrder = structureOrder;
+    });
+    drawDefinition.structures.sort(function (a, b) {
+        return numericSortValue(a.structureOrder) - numericSortValue(b.structureOrder);
+    });
+    return __assign({}, SUCCESS);
+}
+
 function renameStructures$1(_a) {
     var e_1, _b;
     var drawDefinition = _a.drawDefinition, structureDetails = _a.structureDetails;
@@ -45905,6 +45957,7 @@ var structureGovernor = {
     generateAndPopulatePlayoffStructures: generateAndPopulatePlayoffStructures,
     attachPlayoffStructures: attachPlayoffStructures$1,
     addPlayoffStructures: addPlayoffStructures$1,
+    setStructureOrder: setStructureOrder,
     renameStructures: renameStructures$1,
     generateQualifyingStructure: generateQualifyingStructure$1,
     attachQualifyingStructure: attachQualifyingStructure$1,
@@ -48119,11 +48172,15 @@ function eliminationSwap(_a) {
         return qualifier;
     }).length === 2)
         return __assign({}, SUCCESS);
+    var isQualifierSwap = assignments.some(function (_a) {
+        var qualifier = _a.qualifier;
+        return qualifier;
+    });
     var isByeSwap = assignments.some(function (_a) {
         var bye = _a.bye;
         return bye;
     });
-    if (isByeSwap) {
+    if (isByeSwap && !isQualifierSwap) {
         return swapParticipantIdWithBYE({
             inContextDrawMatchUps: inContextDrawMatchUps,
             tournamentRecord: tournamentRecord,
@@ -48135,7 +48192,7 @@ function eliminationSwap(_a) {
         });
     }
     else {
-        return eliminationParticipantSwap({
+        return eliminationPosiitonSwap({
             inContextDrawMatchUps: inContextDrawMatchUps,
             tournamentRecord: tournamentRecord,
             drawDefinition: drawDefinition,
@@ -48204,7 +48261,7 @@ function swapParticipantIdWithBYE(_a) {
         return result;
     return __assign({}, SUCCESS);
 }
-function eliminationParticipantSwap(_a) {
+function eliminationPosiitonSwap(_a) {
     var inContextDrawMatchUps = _a.inContextDrawMatchUps, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, assignments = _a.assignments, matchUpsMap = _a.matchUpsMap, structure = _a.structure, event = _a.event;
     // preserves order of drawPositions in original positionAssignments array
     // while insuring that all attributes are faithfully copied over and only drawPosition is swapped
@@ -48256,11 +48313,15 @@ function roundRobinSwap(_a) {
         structure: structure,
         event: event,
     });
+    var isQualifierSwap = assignments.some(function (_a) {
+        var qualifier = _a.qualifier;
+        return qualifier;
+    });
     var isByeSwap = assignments.some(function (_a) {
         var bye = _a.bye;
         return bye;
     });
-    if (isByeSwap) {
+    if (isByeSwap && !isQualifierSwap) {
         swapParticipantIdWithBYE({
             inContextDrawMatchUps: inContextDrawMatchUps,
             tournamentRecord: tournamentRecord,
@@ -48517,12 +48578,22 @@ var DEFAULT_RATING = 0;
 var MAX_ITERATIONS = 5000;
 function generateDrawMaticRound(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
-    var _e = _a.maxIterations, maxIterations = _e === void 0 ? MAX_ITERATIONS : _e, _f = _a.generateMatchUps, generateMatchUps = _f === void 0 ? true : _f, tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, addToStructure = _a.addToStructure, drawDefinition = _a.drawDefinition, adHocRatings = _a.adHocRatings, structureId = _a.structureId, matchUpIds = _a.matchUpIds, eventType = _a.eventType, structure = _a.structure;
+    var _e, _f;
+    var _g = _a.maxIterations, maxIterations = _g === void 0 ? MAX_ITERATIONS : _g, _h = _a.generateMatchUps, generateMatchUps = _h === void 0 ? true : _h, tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, addToStructure = _a.addToStructure, drawDefinition = _a.drawDefinition, adHocRatings = _a.adHocRatings, structureId = _a.structureId, matchUpIds = _a.matchUpIds, eventType = _a.eventType, structure = _a.structure;
+    if (!drawDefinition)
+        return { error: MISSING_DRAW_DEFINITION };
+    if (!structure && !structureId)
+        return { error: STRUCTURE_NOT_FOUND };
+    if (!structure) {
+        structure = findStructure({ drawDefinition: drawDefinition, structureId: structureId }).structure;
+    }
+    if (!isObject(structure))
+        return { error: MISSING_STRUCTURE };
     if (!(participantIds === null || participantIds === void 0 ? void 0 : participantIds.length)) {
         return { error: MISSING_PARTICIPANT_IDS };
     }
     // create valueObject for each previous encounter within the structure
-    var encounters = getEncounters({ matchUps: structure.matchUps }).encounters;
+    var encounters = getEncounters({ matchUps: (_e = structure === null || structure === void 0 ? void 0 : structure.matchUps) !== null && _e !== void 0 ? _e : [] }).encounters;
     // valueObjects provide "weighting" to each possible pairing of participants
     // {
     //  'P-I-0|P-I-1': 1,
@@ -48554,7 +48625,7 @@ function generateDrawMaticRound(_a) {
             // add SAME_TEAM_VALUE for participants who appear on the same team
             for (var teamParticipants_1 = __values(teamParticipants), teamParticipants_1_1 = teamParticipants_1.next(); !teamParticipants_1_1.done; teamParticipants_1_1 = teamParticipants_1.next()) {
                 var teamParticipant = teamParticipants_1_1.value;
-                var participantIds_1 = teamParticipant.individualParticipantIds || [];
+                var participantIds_1 = (_f = teamParticipant.individualParticipantIds) !== null && _f !== void 0 ? _f : [];
                 var uniquePairings_2 = getPairingsData({ participantIds: participantIds_1 }).uniquePairings;
                 try {
                     for (var uniquePairings_1 = (e_3 = void 0, __values(uniquePairings_2)), uniquePairings_1_1 = uniquePairings_1.next(); !uniquePairings_1_1.done; uniquePairings_1_1 = uniquePairings_1.next()) {
@@ -48587,9 +48658,9 @@ function generateDrawMaticRound(_a) {
     //  'P-I-0|P-I-2': 0,
     //  'P-I-0|P-I-3': 0
     // }
-    var _g = getPairingsData({
+    var _j = getPairingsData({
         participantIds: participantIds,
-    }), uniquePairings = _g.uniquePairings, possiblePairings = _g.possiblePairings, deltaObjects = _g.deltaObjects;
+    }), uniquePairings = _j.uniquePairings, possiblePairings = _j.possiblePairings, deltaObjects = _j.deltaObjects;
     var params = {
         tournamentParticipants: tournamentParticipants,
         possiblePairings: possiblePairings,
@@ -48603,18 +48674,18 @@ function generateDrawMaticRound(_a) {
         eventType: eventType,
         structure: structure,
     };
-    var _h = getPairings(params), candidatesCount = _h.candidatesCount, participantIdPairings = _h.participantIdPairings, iterations = _h.iterations;
+    var _k = getPairings(params), candidatesCount = _k.candidatesCount, participantIdPairings = _k.participantIdPairings, iterations = _k.iterations;
     if (!candidatesCount)
         return { error: NO_CANDIDATES };
     var matchUps;
     if (generateMatchUps) {
         var result = generateAdHocMatchUps$1({
+            structureId: structure === null || structure === void 0 ? void 0 : structure.structureId,
             participantIdPairings: participantIdPairings,
             tournamentRecord: tournamentRecord,
             addToStructure: addToStructure,
             newRound: true,
             drawDefinition: drawDefinition,
-            structureId: structureId,
             matchUpIds: matchUpIds,
         });
         if (result.error)
@@ -48759,8 +48830,8 @@ function getParticipantPairingValues(_a) {
 
 function drawMatic$1(_a) {
     var e_1, _b;
-    var _c, _d, _e, _f;
-    var tournamentParticipants = _a.tournamentParticipants, restrictEntryStatus = _a.restrictEntryStatus, tournamentRecord = _a.tournamentRecord, generateMatchUps = _a.generateMatchUps, addToStructure = _a.addToStructure, participantIds = _a.participantIds, drawDefinition = _a.drawDefinition, maxIterations = _a.maxIterations, structureId = _a.structureId, matchUpIds = _a.matchUpIds, scaleName = _a.scaleName, // custom rating name to seed dynamic ratings
+    var _c, _d, _e, _f, _g;
+    var tournamentParticipants = _a.tournamentParticipants, restrictEntryStatus = _a.restrictEntryStatus, tournamentRecord = _a.tournamentRecord, generateMatchUps = _a.generateMatchUps, addToStructure = _a.addToStructure, participantIds = _a.participantIds, drawDefinition = _a.drawDefinition, scaleAccessor = _a.scaleAccessor, maxIterations = _a.maxIterations, structureId = _a.structureId, matchUpIds = _a.matchUpIds, scaleName = _a.scaleName, // custom rating name to seed dynamic ratings
     eventType = _a.eventType, event = _a.event;
     if (typeof drawDefinition !== 'object' ||
         (drawDefinition.drawType && drawDefinition.drawType !== AD_HOC)) {
@@ -48808,6 +48879,8 @@ function drawMatic$1(_a) {
     var structureIsAdHoc = isAdHoc({ drawDefinition: drawDefinition, structure: structure });
     if (!structureIsAdHoc)
         return { error: INVALID_DRAW_DEFINITION };
+    tournamentParticipants =
+        (_g = tournamentParticipants !== null && tournamentParticipants !== void 0 ? tournamentParticipants : tournamentRecord.participants) !== null && _g !== void 0 ? _g : [];
     var adHocRatings = {};
     var _loop_1 = function (participantId) {
         var participant = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.find(function (participant) { return participant.participantId === participantId; });
@@ -48815,24 +48888,31 @@ function drawMatic$1(_a) {
         var scaleValue = getScaleValue({ eventType: eventType, participant: participant });
         // if no dynamic value found and a seeding scaleValue is provided...
         if (!scaleValue && scaleName) {
-            scaleValue = getScaleValue({ scaleName: scaleName, eventType: eventType, participant: participant });
+            scaleValue = getScaleValue({
+                scaleAccessor: scaleAccessor,
+                participant: participant,
+                scaleName: scaleName,
+                eventType: eventType,
+            });
         }
         if (scaleValue)
             adHocRatings[participantId] = scaleValue;
     };
     try {
-        for (var _g = __values(participantIds !== null && participantIds !== void 0 ? participantIds : []), _h = _g.next(); !_h.done; _h = _g.next()) {
-            var participantId = _h.value;
+        for (var _h = __values(participantIds !== null && participantIds !== void 0 ? participantIds : []), _j = _h.next(); !_j.done; _j = _h.next()) {
+            var participantId = _j.value;
             _loop_1(participantId);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+            if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
         }
         finally { if (e_1) throw e_1.error; }
     }
+    // TODO: update dynamic ratings based on matchUps present from last played round
+    // use scaleEngine.processMatchUps(); see dynamicCalculations.test.ts
     return generateDrawMaticRound({
         tournamentParticipants: tournamentParticipants,
         tournamentRecord: tournamentRecord,
@@ -48842,7 +48922,6 @@ function drawMatic$1(_a) {
         drawDefinition: drawDefinition,
         maxIterations: maxIterations,
         adHocRatings: adHocRatings,
-        structureId: structureId,
         matchUpIds: matchUpIds,
         structure: structure,
         eventType: eventType,
@@ -48850,7 +48929,7 @@ function drawMatic$1(_a) {
 }
 function getScaleValue(_a) {
     var _b;
-    var _c = _a.scaleName, scaleName = _c === void 0 ? 'dynamic' : _c, eventType = _a.eventType, participant = _a.participant;
+    var _c = _a.eventType, eventType = _c === void 0 ? TypeEnum.Singles : _c, _d = _a.scaleName, scaleName = _d === void 0 ? 'dynamic' : _d, scaleAccessor = _a.scaleAccessor, participant = _a.participant;
     var scaleAttributes = {
         eventType: eventType || TypeEnum.Singles,
         scaleType: RATING$2,
@@ -48861,7 +48940,10 @@ function getScaleValue(_a) {
             scaleAttributes: scaleAttributes,
             participant: participant,
         });
-    return (_b = result === null || result === void 0 ? void 0 : result.scaleItem) === null || _b === void 0 ? void 0 : _b.scaleValue;
+    var scaleValue = (_b = result === null || result === void 0 ? void 0 : result.scaleItem) === null || _b === void 0 ? void 0 : _b.scaleValue;
+    return scaleAccessor && isObject(scaleValue)
+        ? scaleValue[scaleAccessor]
+        : scaleValue;
 }
 
 function setDelegatedOutcome$1(_a) {
@@ -51194,13 +51276,19 @@ function getOrderedTieFormat(_a) {
         if (collectionOrder)
             collectionDefinition.collectionOrder = collectionOrder;
     });
-    orderedTieFormat.collectionDefinitions.sort(function (a, b) { return a.collectionOrder - b.collectionOrder; });
+    orderedTieFormat.collectionDefinitions.sort(function (a, b) {
+        return numericSortValue(a.collectionOrder) - numericSortValue(b.collectionOrder);
+    });
     return orderedTieFormat;
 }
 function orderCollectionDefinitions(_a) {
     var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, matchUpId = _a.matchUpId, orderMap = _a.orderMap, eventId = _a.eventId, matchUp = _a.matchUp, event = _a.event;
-    if (typeof orderMap !== 'object')
-        return { error: INVALID_VALUES, orderMap: orderMap };
+    if (typeof orderMap !== 'object' ||
+        !Object.values(orderMap).every(function (val) { return isConvertableInteger(val); }))
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { orderMap: orderMap },
+        });
     if (eventId && (event === null || event === void 0 ? void 0 : event.tieFormat)) {
         updateEventTieFormat({ tournamentRecord: tournamentRecord, event: event, orderMap: orderMap });
     }
@@ -52839,7 +52927,8 @@ function modifyTieFormat(_a) {
     processedTieFormat.collectionDefinitions =
         processedTieFormat.collectionDefinitions
             .sort(function (a, b) {
-            return (a.collectionOrder || Infinity) - (b.collectionOrder || Infinity);
+            return numericSortValue(a.collectionOrder) -
+                numericSortValue(b.collectionOrder);
         })
             .map(function (def, i) { return (__assign(__assign({}, def), { collectionOrder: i + 1 })); });
     return __assign(__assign({}, SUCCESS), { processedTieFormat: processedTieFormat });
@@ -58760,19 +58849,29 @@ function removeTieMatchUpParticipantId(params) {
 }
 
 function getPositionAssignments(_a) {
-    var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, structure = _a.structure;
+    var _b;
+    var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, _c = _a.stage, stage = _c === void 0 ? MAIN : _c, structureId = _a.structureId, structure = _a.structure;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!structure && !drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
+    if (!structure &&
+        !structureId &&
+        ((_b = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _b === void 0 ? void 0 : _b.filter(function (structure) { return structure.stage === stage; }).length) === 1) {
+        structure = drawDefinition.structures.find(function (structure) { return structure.stage === stage; });
+    }
     if (!structure && !structureId)
         return { error: MISSING_STRUCTURE_ID };
-    var _b = getPositionAssignments$1({
+    var _d = getPositionAssignments$1({
         drawDefinition: drawDefinition,
         structureId: structureId,
         structure: structure,
-    }), error = _b.error, assignments = _b.positionAssignments;
-    return { error: error, positionAssignments: assignments || [] };
+    }), error = _d.error, assignments = _d.positionAssignments;
+    return {
+        error: error,
+        positionAssignments: assignments || [],
+        structureId: structure === null || structure === void 0 ? void 0 : structure.structureId,
+    };
 }
 
 function deleteDrawDefinitions(_a) {
@@ -61811,12 +61910,13 @@ function addVoluntaryConsolationStructure(params) {
 }
 
 function prepareStage(params) {
+    var _a;
     var seedsCount = params.seedsCount;
     var preparedStructureIds = params.preparedStructureIds || [];
-    var provisionalPositioning = params.provisionalPositioning, inContextDrawMatchUps = params.inContextDrawMatchUps, tournamentRecord = params.tournamentRecord, appliedPolicies = params.appliedPolicies, qualifyingOnly = params.qualifyingOnly, drawDefinition = params.drawDefinition, seedingProfile = params.seedingProfile, participants = params.participants, matchUpsMap = params.matchUpsMap, automated = params.automated, placeByes = params.placeByes, drawType = params.drawType, drawSize = params.drawSize, entries = params.entries, event = params.event, _a = params.enforcePolicyLimits, enforcePolicyLimits = _a === void 0 ? true : _a, seedAssignmentProfile = params.seedAssignmentProfile, // mainly used by mocksEngine for scenario testing
-    _b = params.seedByRanking, // mainly used by mocksEngine for scenario testing
-    seedByRanking = _b === void 0 ? true : _b, seededParticipants = params.seededParticipants, assignSeedsCount = params.assignSeedsCount, // used for testing bye placement next to seeds
-    seedingScaleName = params.seedingScaleName, _c = params.stageSequence, stageSequence = _c === void 0 ? 1 : _c, roundTarget = params.roundTarget, stage = params.stage;
+    var provisionalPositioning = params.provisionalPositioning, inContextDrawMatchUps = params.inContextDrawMatchUps, tournamentRecord = params.tournamentRecord, appliedPolicies = params.appliedPolicies, qualifyingOnly = params.qualifyingOnly, drawDefinition = params.drawDefinition, seedingProfile = params.seedingProfile, participants = params.participants, matchUpsMap = params.matchUpsMap, automated = params.automated, placeByes = params.placeByes, drawType = params.drawType, drawSize = params.drawSize, entries = params.entries, event = params.event, _b = params.enforcePolicyLimits, enforcePolicyLimits = _b === void 0 ? true : _b, seedAssignmentProfile = params.seedAssignmentProfile, // mainly used by mocksEngine for scenario testing
+    _c = params.seedByRanking, // mainly used by mocksEngine for scenario testing
+    seedByRanking = _c === void 0 ? true : _c, seededParticipants = params.seededParticipants, assignSeedsCount = params.assignSeedsCount, // used for testing bye placement next to seeds
+    seedingScaleName = params.seedingScaleName, _d = params.stageSequence, stageSequence = _d === void 0 ? 1 : _d, roundTarget = params.roundTarget, stage = params.stage;
     var eventType = event === null || event === void 0 ? void 0 : event.eventType;
     var stageEntries = entries.filter(function (entry) {
         var _a, _b;
@@ -61906,7 +62006,7 @@ function prepareStage(params) {
     }
     else if (event || seedingScaleName) {
         // if no seededParticipants have been defined, seed by seeding scale or ranking scale, if present
-        var _d = (event === null || event === void 0 ? void 0 : event.category) || {}, categoryName = _d.categoryName, ageCategoryCode = _d.ageCategoryCode;
+        var _e = (event === null || event === void 0 ? void 0 : event.category) || {}, categoryName = _e.categoryName, ageCategoryCode = _e.ageCategoryCode;
         var seedingScaleAttributes = {
             scaleType: SEEDING$1,
             scaleName: seedingScaleName || categoryName || ageCategoryCode || event.eventId,
@@ -61933,7 +62033,7 @@ function prepareStage(params) {
                 stage: stage,
             }).scaledEntries);
         }
-        var scaledEntriesCount = (scaledEntries === null || scaledEntries === void 0 ? void 0 : scaledEntries.length) || 0;
+        var scaledEntriesCount = (_a = scaledEntries === null || scaledEntries === void 0 ? void 0 : scaledEntries.length) !== null && _a !== void 0 ? _a : 0;
         if (scaledEntriesCount < seedsCount)
             seedsCount = scaledEntriesCount;
         scaledEntries === null || scaledEntries === void 0 ? void 0 : scaledEntries.filter(function (_a) {
@@ -62368,13 +62468,21 @@ function generateDrawDefinition(params) {
             var participantIds_1 = entries_2 === null || entries_2 === void 0 ? void 0 : entries_2.map(extractAttributes('participantId'));
             var matchUpsCount_1 = entries_2 ? Math.floor(entries_2.length / 2) : 0;
             generateRange(1, params.roundsCount + 1).forEach(function () {
+                var _a, _b, _c;
                 if (params.automated) {
+                    var _d = (_a = params.drawMatic) !== null && _a !== void 0 ? _a : {}, restrictEntryStatus = _d.restrictEntryStatus, generateMatchUps = _d.generateMatchUps, addToStructure = _d.addToStructure, maxIterations = _d.maxIterations, structureId_1 = _d.structureId, matchUpIds = _d.matchUpIds, scaleName = _d.scaleName;
                     drawMatic$1({
-                        generateMatchUps: true,
-                        eventType: matchUpType,
                         tournamentRecord: tournamentRecord,
                         participantIds: participantIds_1,
                         drawDefinition: drawDefinition,
+                        eventType: (_c = (_b = params.drawMatic) === null || _b === void 0 ? void 0 : _b.eventType) !== null && _c !== void 0 ? _c : matchUpType,
+                        generateMatchUps: generateMatchUps !== null && generateMatchUps !== void 0 ? generateMatchUps : true,
+                        restrictEntryStatus: restrictEntryStatus,
+                        addToStructure: addToStructure,
+                        maxIterations: maxIterations,
+                        structureId: structureId_1,
+                        matchUpIds: matchUpIds,
+                        scaleName: scaleName,
                     });
                 }
                 else {
@@ -62478,6 +62586,12 @@ function renameStructures(params) {
     return renameStructures$1(params);
 }
 
+function resetMatchUpLineUps(params) {
+    if (!params.tournamentRecord)
+        return { error: MISSING_TOURNAMENT_RECORD };
+    return resetMatchUpLineUps$1(params);
+}
+
 function aggregateTieFormats(_a) {
     var e_1, _b;
     var _c, _d, _e, _f, _g;
@@ -62653,18 +62767,13 @@ function enableTieAutoCalc(params) {
     return enableTieAutoCalc$1(params);
 }
 
-function resetMatchUpLineUps(params) {
-    if (!params.tournamentRecord)
-        return { error: MISSING_TOURNAMENT_RECORD };
-    return resetMatchUpLineUps$1(params);
-}
-
 var eventGovernor = {
     generateQualifyingStructure: generateQualifyingStructure,
     attachQualifyingStructure: attachQualifyingStructure,
     attachPlayoffStructures: attachPlayoffStructures,
-    attachStructures: attachStructures,
     addQualifyingStructure: addQualifyingStructure,
+    setStructureOrder: setStructureOrder,
+    attachStructures: attachStructures,
     renameStructures: renameStructures,
     disableTieAutoCalc: disableTieAutoCalc,
     enableTieAutoCalc: enableTieAutoCalc,
@@ -62763,9 +62872,10 @@ var eventGovernor = {
     checkOutParticipant: checkOutParticipant,
     toggleParticipantCheckInState: toggleParticipantCheckInState$1,
     addDrawDefinitionTimeItem: addDrawDefinitionTimeItem,
-    generateDrawDefinition: generateDrawDefinition,
-    generateDrawStructuresAndLinks: generateDrawStructuresAndLinks,
     generateDrawTypeAndModifyDrawDefinition: generateDrawTypeAndModifyDrawDefinition,
+    generateDrawStructuresAndLinks: generateDrawStructuresAndLinks,
+    generateDrawMaticRound: generateDrawMaticRound,
+    generateDrawDefinition: generateDrawDefinition,
     applyLineUps: applyLineUps,
     assignTieMatchUpParticipantId: assignTieMatchUpParticipantId,
     removeTieMatchUpParticipantId: removeTieMatchUpParticipantId,