tods-competition-factory 1.7.13 → 1.7.14

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.7.13';
+    return '1.7.14';
 }
 
 /******************************************************************************
@@ -2947,8 +2947,9 @@ function decorateResult(_a) {
     if (result && Array.isArray(result === null || result === void 0 ? void 0 : result.stack) && typeof stack === 'string') {
         result.stack.push(stack);
     }
-    if (info && (result === null || result === void 0 ? void 0 : result.error))
-        result.error.info = info;
+    if (result && info) {
+        result.info = info;
+    }
     if (result && typeof context === 'object' && Object.keys(context).length) {
         Object.assign(result, definedAttributes(context));
     }
@@ -3525,7 +3526,7 @@ function validateTieFormat(params) {
     var tieFormat = params === null || params === void 0 ? void 0 : params.tieFormat;
     var stack = 'validateTieFormat';
     var errors = [];
-    if (typeof tieFormat !== 'object') {
+    if (!params || !tieFormat || typeof tieFormat !== 'object') {
         errors.push('tieFormat must be an object');
         return decorateResult({
             result: {
@@ -3644,7 +3645,7 @@ function validateCollectionDefinition(_a) {
         errors.push("collectionValue is not type number: ".concat(collectionValue));
     }
     if (collectionValueProfiles) {
-        var result = validateCollectionValueProfile({
+        var result = validateCollectionValueProfiles({
             collectionValueProfiles: collectionValueProfiles,
             matchUpCount: matchUpCount,
         });
@@ -3691,7 +3692,7 @@ function checkTieFormat(tieFormat) {
     }
     return { tieFormat: tieFormat };
 }
-function validateCollectionValueProfile(_a) {
+function validateCollectionValueProfiles(_a) {
     var e_2, _b;
     var collectionValueProfiles = _a.collectionValueProfiles, matchUpCount = _a.matchUpCount;
     var errors = [];
@@ -18178,6 +18179,10 @@ function proConflicts(_a) {
     return { courtIssues: courtIssues, rowIssues: rowIssues };
 }
 
+function stringSort(a, b) {
+    return (a || '').localeCompare(b || '');
+}
+
 function getTieFormatDesc(tieFormat) {
     var _a;
     if (!tieFormat)
@@ -18266,18 +18271,57 @@ function compareTieFormats(_a) {
         ancestorDifferences.collectionsValue.totalValue;
     var matchUpCountDifference = descendantDifferences.collectionsValue.totalMatchUps -
         ancestorDifferences.collectionsValue.totalMatchUps;
+    var assignmentValuesCountDifference = ancestorDifferences.collectionsValue.assignmentValues.length !==
+        descendantDifferences.collectionsValue.assignmentValues.length;
+    var assignmentValuesDifference = ancestorDifferences.collectionsValue.assignmentValues.some(function (assignment, i) {
+        var comparisonAssignment = descendantDifferences.collectionsValue.assignmentValues[i];
+        if (!comparisonAssignment)
+            return true;
+        if (assignment.valueKey !== comparisonAssignment.valueKey)
+            return true;
+        if (assignment.value !== comparisonAssignment.value)
+            return true;
+        if (Array.isArray(assignment.value)) {
+            return assignment.value.every(function (value, i) { return comparisonAssignment.value[i] === value; });
+        }
+        return false;
+    });
     var different = nameDifference ||
         orderDifference ||
         ancestorDesc !== descendantDesc ||
+        assignmentValuesCountDifference ||
+        assignmentValuesDifference ||
         valueDifference !== 0;
-    return __assign(__assign({ matchUpFormatDifferences: matchUpFormatDifferences, matchUpCountDifference: matchUpCountDifference, descendantDifferences: descendantDifferences, ancestorDifferences: ancestorDifferences, orderDifference: orderDifference, valueDifference: valueDifference, nameDifference: nameDifference, descendantDesc: descendantDesc, ancestorDesc: ancestorDesc }, SUCCESS), { different: different });
+    var invalidValues = __spreadArray(__spreadArray([], __read(ancestorDifferences.collectionsValue.invalidValues), false), __read(descendantDifferences.collectionsValue.invalidValues), false);
+    var invalid = invalidValues.length && invalidValues;
+    return __assign(__assign({ matchUpFormatDifferences: matchUpFormatDifferences, matchUpCountDifference: matchUpCountDifference, descendantDifferences: descendantDifferences, ancestorDifferences: ancestorDifferences, orderDifference: orderDifference, valueDifference: valueDifference, nameDifference: nameDifference, descendantDesc: descendantDesc, ancestorDesc: ancestorDesc }, SUCCESS), { different: different, invalid: invalid });
 }
 function getCollectionsValue(definitions) {
+    var invalidValues = [];
+    var assignmentValues = [];
     var totalMatchUps = 0;
-    var collectionIds = Object.keys(definitions);
+    var collectionIds = Object.keys(definitions).sort(stringSort);
     var totalValue = collectionIds.reduce(function (total, collectionId) {
         var collectionDefinition = definitions[collectionId];
         var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionValue = collectionDefinition.collectionValue, matchUpCount = collectionDefinition.matchUpCount, matchUpValue = collectionDefinition.matchUpValue, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue;
+        var valueAssignments = {
+            collectionValueProfiles: collectionValueProfiles,
+            collectionValue: collectionValue,
+            matchUpValue: matchUpValue,
+            scoreValue: scoreValue,
+            setValue: setValue,
+        };
+        var valueKeys = Object.keys(valueAssignments).filter(function (key) { return ![undefined, null].includes(valueAssignments[key]); });
+        if (valueKeys.length !== 1) {
+            invalidValues.push({ collectionId: collectionId });
+        }
+        var valueKey = valueKeys[0];
+        if (valueKey) {
+            var value = valueKey === 'collectionValueProfiles'
+                ? Object.values(collectionValueProfiles)
+                : valueAssignments[valueKey];
+            assignmentValues.push({ valueKey: valueKey, value: value });
+        }
         totalMatchUps += matchUpCount;
         if (collectionValueProfiles)
             return (total +
@@ -18293,7 +18337,7 @@ function getCollectionsValue(definitions) {
         }
         return total;
     }, 0);
-    return { totalValue: totalValue, totalMatchUps: totalMatchUps };
+    return { totalValue: totalValue, totalMatchUps: totalMatchUps, invalidValues: invalidValues, assignmentValues: assignmentValues };
 }
 
 function dehydrateMatchUps(_a) {
@@ -32036,7 +32080,7 @@ function getTieFormat$1(_a) {
     }
     if (!tieFormat)
         return decorateResult({ result: { error: MISSING_TIE_FORMAT }, stack: stack });
-    return __assign(__assign({}, SUCCESS), { tieFormat: tieFormat, matchUp: matchUp, structure: structure });
+    return __assign(__assign({}, SUCCESS), { structure: structure, tieFormat: tieFormat, matchUp: matchUp });
 }
 
 function tieFormatTelemetry(_a) {
@@ -32054,6 +32098,38 @@ function tieFormatTelemetry(_a) {
     addExtension$1({ element: drawDefinition, extension: updatedExtension });
 }
 
+function generateTieMatchUps(_a) {
+    var tieFormat = _a.tieFormat, isMock = _a.isMock, uuids = _a.uuids;
+    var collectionDefinitions = (tieFormat !== null && tieFormat !== void 0 ? tieFormat : {}).collectionDefinitions;
+    var tieMatchUps = (collectionDefinitions !== null && collectionDefinitions !== void 0 ? collectionDefinitions : [])
+        .map(function (collectionDefinition) {
+        return generateCollectionMatchUps({ collectionDefinition: collectionDefinition, uuids: uuids, isMock: isMock });
+    })
+        .filter(Boolean)
+        .flat();
+    return { tieMatchUps: tieMatchUps };
+}
+function generateCollectionMatchUps(_a) {
+    var _b;
+    var _c = _a.collectionPositionOffset, collectionPositionOffset = _c === void 0 ? 0 : _c, collectionDefinition = _a.collectionDefinition, matchUpsLimit = _a.matchUpsLimit, // internal use allows generation of missing matchUps on "reset"
+    isMock = _a.isMock, uuids = _a.uuids;
+    var _d = collectionDefinition || {}, matchUpCount = _d.matchUpCount, matchUpType = _d.matchUpType, collectionId = _d.collectionId, processCodes = _d.processCodes;
+    var numberToGenerate = (_b = matchUpsLimit !== null && matchUpsLimit !== void 0 ? matchUpsLimit : matchUpCount) !== null && _b !== void 0 ? _b : 0;
+    return generateRange(0, numberToGenerate).map(function (index) {
+        var collectionPosition = collectionPositionOffset + index + 1;
+        return {
+            sides: [{ sideNumber: 1 }, { sideNumber: 2 }],
+            matchUpId: (uuids === null || uuids === void 0 ? void 0 : uuids.pop()) || UUID(),
+            matchUpStatus: MatchUpStatusEnum.ToBePlayed,
+            collectionPosition: collectionPosition,
+            collectionId: collectionId,
+            processCodes: processCodes,
+            matchUpType: matchUpType,
+            isMock: isMock,
+        };
+    });
+}
+
 function validUpdate(_a) {
     var matchUp = _a.matchUp, updateInProgressMatchUps = _a.updateInProgressMatchUps;
     return (!matchUp.winningSide &&
@@ -32063,17 +32139,29 @@ function validUpdate(_a) {
 }
 
 // used to determine that all collections have the same collectionIds
-function mapsCheck(map1, map2) {
-    var referenceKeys = Object.keys(map1);
-    return (intersection(referenceKeys, Object.keys(map2)).length ===
-        referenceKeys.length);
+function checkStructureMatchUpCounts(_a) {
+    var from = _a.from, to = _a.to;
+    var referenceKeys = Object.keys(from);
+    var sameKeys = intersection(referenceKeys, Object.keys(to)).length ===
+        referenceKeys.length;
+    var differentMatchUpsCount = referenceKeys.filter(function (collectionId) { return from[collectionId] !== to[collectionId]; });
+    var matchUpsCountChanges = differentMatchUpsCount.map(function (collectionId) { return ({
+        countChange: to[collectionId] - from[collectionId],
+        collectionId: collectionId,
+    }); });
+    var sameMatchUpsCount = referenceKeys.every(function (key) { return from[key] === to[key]; });
+    var equivalent = sameKeys && sameMatchUpsCount;
+    return { equivalent: equivalent, matchUpsCountChanges: matchUpsCountChanges };
 }
 function updateTieFormat(_a) {
     var e_1, _b;
     var _c, _d, _e, _f, _g;
-    var updateInProgressMatchUps = _a.updateInProgressMatchUps, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structure = _a.structure, tieFormat = _a.tieFormat, eventId = _a.eventId, matchUp = _a.matchUp, event = _a.event;
+    var updateInProgressMatchUps = _a.updateInProgressMatchUps, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structure = _a.structure, tieFormat = _a.tieFormat, eventId = _a.eventId, matchUp = _a.matchUp, event = _a.event, uuids = _a.uuids;
     var stack = 'updateTieFormat';
+    var tournamentId = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId;
     var modifiedStructuresCount = 0;
+    var modifiedMatchUpsCount = 0;
+    var addedMatchUpsCount = 0;
     var modifiedCount = 0;
     var collectionMap = tieFormat === null || tieFormat === void 0 ? void 0 : tieFormat.collectionDefinitions.reduce(function (instanceMap, def) {
         instanceMap[def.collectionId] =
@@ -32087,7 +32175,8 @@ function updateTieFormat(_a) {
                 (instanceMap[def.collectionId] || 0) + def.matchUpCount;
             return instanceMap;
         }, {});
-        return mapsCheck(collectionMap, cMap);
+        return checkStructureMatchUpCounts({ from: cMap, to: collectionMap })
+            .equivalent;
     };
     var drawDefaultTieFormat = (_c = getTieFormat$1({ drawDefinition: drawDefinition })) === null || _c === void 0 ? void 0 : _c.tieFormat;
     var eventDefaultTieFormat = (_d = getTieFormat$1({ event: event })) === null || _d === void 0 ? void 0 : _d.tieFormat;
@@ -32105,7 +32194,7 @@ function updateTieFormat(_a) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        event.tieFormat = tieFormat;
+        event.tieFormat = copyTieFormat(tieFormat);
         modifiedCount += 1;
     }
     else if (matchUp) {
@@ -32117,9 +32206,17 @@ function updateTieFormat(_a) {
             var collectionId = _a.collectionId;
             return collectionId;
         }));
-        if (mapsCheck(collectionMap, matchUpMap)) {
+        var check = checkStructureMatchUpCounts({
+            to: collectionMap,
+            from: matchUpMap,
+        });
+        var _k = getMatchUpChangesArePossible({
+            matchUp: matchUp,
+            check: check,
+        }), changes = _k.changes, changesArePossible = _k.changesArePossible, cannotChangeReaon = _k.cannotChangeReaon;
+        if (check.equivalent) {
             if (validUpdate({ matchUp: matchUp, updateInProgressMatchUps: updateInProgressMatchUps })) {
-                matchUp.tieFormat = tieFormat;
+                matchUp.tieFormat = copyTieFormat(tieFormat);
                 modifiedCount += 1;
             }
             else {
@@ -32129,19 +32226,23 @@ function updateTieFormat(_a) {
                 });
             }
         }
+        else if (changesArePossible) {
+            makeChanges({ tieFormat: tieFormat, matchUp: matchUp, changes: changes, uuids: uuids });
+        }
         else {
             return decorateResult({
                 context: { collectionMap: collectionMap, matchUpMap: matchUpMap },
                 result: { error: INVALID_TIE_FORMAT },
-                info: 'on matchUp',
+                info: cannotChangeReaon || 'specified changes not possible',
                 stack: stack,
             });
         }
+        modifiedMatchUpsCount += 1;
         modifyMatchUpNotice({
-            tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
             eventId: event === null || event === void 0 ? void 0 : event.eventId,
             context: stack,
             drawDefinition: drawDefinition,
+            tournamentId: tournamentId,
             matchUp: matchUp,
         });
     }
@@ -32149,30 +32250,43 @@ function updateTieFormat(_a) {
         // all TEAM matchUps within the structure have tieMatchUps which were created following a tieFormat which occurs higher in the hierarchy
         // attaching a tieFormat to the structure must ensure that affected TEAM matchUps within the structure all have appropriate tieMatchUps
         // therefore those that fail to match the modified tieFormat MUST have an appropriate tieFormat attached from higher in the hierarchy
-        var inheritedTieFormat = drawDefaultTieFormat || eventDefaultTieFormat;
+        var inheritedTieFormat = drawDefaultTieFormat !== null && drawDefaultTieFormat !== void 0 ? drawDefaultTieFormat : eventDefaultTieFormat;
         var modified = (_g = processStructure({
             inheritedTieFormat: inheritedTieFormat,
             structure: structure,
-        })) === null || _g === void 0 ? void 0 : _g.modifiedCount;
-        if (modified)
-            modifiedStructuresCount += modified;
-        structure.tieFormat = tieFormat;
-        modifiedCount += 1;
-        modifyDrawNotice({
-            structureIds: [structure.structureId],
-            eventId: event === null || event === void 0 ? void 0 : event.eventId,
-            drawDefinition: drawDefinition,
-        });
+        })) === null || _g === void 0 ? void 0 : _g.modifiedMatchUpsCount;
+        if (modified) {
+            modifiedMatchUpsCount += modified;
+            modifiedStructuresCount += 1;
+            modifiedCount += 1;
+        }
+        var different = !structure.tieFormat ||
+            compareTieFormats({
+                ancestor: structure.tieFormat,
+                descendant: tieFormat,
+            }).different;
+        if (different) {
+            structure.tieFormat = copyTieFormat(tieFormat);
+            modifiedStructuresCount += 1;
+            modifiedCount += 1;
+        }
+        (modified || different) &&
+            drawDefinition &&
+            modifyDrawNotice({
+                structureIds: [structure.structureId],
+                eventId: event === null || event === void 0 ? void 0 : event.eventId,
+                drawDefinition: drawDefinition,
+            });
     }
     else if (drawDefinition) {
         processDrawDefinition({ drawDefinition: drawDefinition });
-        drawDefinition.tieFormat = tieFormat;
+        drawDefinition.tieFormat = copyTieFormat(tieFormat);
         modifiedCount += 1;
     }
     else {
         return { error: MISSING_DRAW_DEFINITION };
     }
-    return __assign(__assign({}, SUCCESS), { modifiedCount: modifiedCount, modifiedStructuresCount: modifiedStructuresCount, tieFormat: tieFormat });
+    return __assign(__assign({ modifiedStructuresCount: modifiedStructuresCount, modifiedMatchUpsCount: modifiedMatchUpsCount, addedMatchUpsCount: addedMatchUpsCount, modifiedCount: modifiedCount }, SUCCESS), { tieFormat: tieFormat });
     function processDrawDefinition(_a) {
         var e_2, _b;
         var _c;
@@ -32189,9 +32303,10 @@ function updateTieFormat(_a) {
                 var modifiedCount_1 = (_c = processStructure({
                     inheritedTieFormat: inheritedTieFormat,
                     structure: structure_1,
-                })) === null || _c === void 0 ? void 0 : _c.modifiedCount;
+                })) === null || _c === void 0 ? void 0 : _c.modifiedMatchUpsCount;
                 if (modifiedCount_1) {
-                    modifiedStructuresCount += modifiedCount_1;
+                    modifiedStructuresCount += 1;
+                    modifiedMatchUpsCount += modifiedCount_1;
                     var structureId = structure_1.structureId;
                     modifiedStructureIds.push(structureId);
                 }
@@ -32215,7 +32330,7 @@ function updateTieFormat(_a) {
         var e_3, _b;
         var _c, _d;
         var inheritedTieFormat = _a.inheritedTieFormat, structure = _a.structure;
-        var modifiedCount = 0;
+        var modifiedMatchUpsCount = 0;
         var structureMatchUps = ((_c = getAllStructureMatchUps({
             matchUpFilters: { matchUpTypes: [TEAM$2] },
             structure: structure,
@@ -32223,15 +32338,34 @@ function updateTieFormat(_a) {
         try {
             for (var structureMatchUps_1 = __values(structureMatchUps), structureMatchUps_1_1 = structureMatchUps_1.next(); !structureMatchUps_1_1.done; structureMatchUps_1_1 = structureMatchUps_1.next()) {
                 var matchUp_1 = structureMatchUps_1_1.value;
+                var validToUpdate = validUpdate({ matchUp: matchUp_1, updateInProgressMatchUps: updateInProgressMatchUps });
                 var modified = false;
                 var tieMatchUpsMap = instanceCount((_d = matchUp_1.tieMatchUps) === null || _d === void 0 ? void 0 : _d.map(function (_a) {
                     var collectionId = _a.collectionId;
                     return collectionId;
                 }));
-                if (!mapsCheck(collectionMap, tieMatchUpsMap)) {
-                    if (inheritedTieFormat) {
-                        matchUp_1.tieFormat = inheritedTieFormat;
-                        modified = true;
+                var check = checkStructureMatchUpCounts({
+                    from: tieMatchUpsMap,
+                    to: collectionMap,
+                });
+                if (!check.equivalent) {
+                    var _e = getMatchUpChangesArePossible({
+                        matchUp: matchUp_1,
+                        check: check,
+                    }), changes = _e.changes, changesArePossible = _e.changesArePossible;
+                    if (changesArePossible && !matchUp_1.tieFormat) {
+                        makeChanges({ changes: changes, matchUp: matchUp_1, tieFormat: tieFormat, uuids: uuids });
+                    }
+                    else if (inheritedTieFormat) {
+                        var different = !matchUp_1.tieFormat ||
+                            compareTieFormats({
+                                ancestor: inheritedTieFormat,
+                                descendant: matchUp_1.tieFormat,
+                            }).different;
+                        if (different) {
+                            matchUp_1.tieFormat = inheritedTieFormat;
+                            modified = true;
+                        }
                     }
                     else {
                         return decorateResult({
@@ -32242,12 +32376,12 @@ function updateTieFormat(_a) {
                 }
                 else if (matchUp_1.tieFormat &&
                     matchingCollections(matchUp_1) &&
-                    validUpdate({ matchUp: matchUp_1, updateInProgressMatchUps: updateInProgressMatchUps })) {
+                    validToUpdate) {
                     matchUp_1.tieFormat = copyTieFormat(tieFormat);
                     modified = true;
                 }
                 if (modified) {
-                    modifiedCount += 1;
+                    modifiedMatchUpsCount += 1;
                     modifyMatchUpNotice({
                         tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
                         drawDefinition: drawDefinition,
@@ -32265,11 +32399,83 @@ function updateTieFormat(_a) {
             }
             finally { if (e_3) throw e_3.error; }
         }
-        return { modifiedCount: modifiedCount };
+        return { modifiedMatchUpsCount: modifiedMatchUpsCount };
     }
+    function makeChanges(_a) {
+        var uuids = _a.uuids, matchUp = _a.matchUp, tieFormat = _a.tieFormat, changes = _a.changes;
+        matchUp.tieFormat = copyTieFormat(tieFormat);
+        var matchUpIdsRemoved = [];
+        var matchUpsAdded = [];
+        changes.forEach(function (change) {
+            var _a;
+            if (change.countChange > 0) {
+                var collectionPositionOffset = Math.max.apply(Math, __spreadArray([0], __read(matchUp.tieMatchUps
+                    .filter(function (tieMatchUp) { return tieMatchUp.collectionId === change.collectionId; })
+                    .map(extractAttributes('collectionPosition'))), false));
+                var collectionDefinition = tieFormat.collectionDefinitions.find(function (def) { return def.collectionId === change.collectionId; });
+                var newMatchUps = generateCollectionMatchUps({
+                    matchUpsLimit: change.countChange,
+                    collectionPositionOffset: collectionPositionOffset,
+                    collectionDefinition: collectionDefinition,
+                    uuids: uuids,
+                });
+                matchUpsAdded.push.apply(matchUpsAdded, __spreadArray([], __read(makeDeepCopy(newMatchUps, false, true)), false));
+                addedMatchUpsCount += matchUpsAdded.length;
+                (_a = matchUp.tieMatchUps).push.apply(_a, __spreadArray([], __read(newMatchUps), false));
+            }
+            else {
+                var tieMatchUpIdsToRemove_1 = change.toBePlayedTieMatchUpIds.slice(0, Math.abs(change.countChange));
+                console.log('remove', tieMatchUpIdsToRemove_1.length);
+                matchUpIdsRemoved.push.apply(matchUpIdsRemoved, __spreadArray([], __read(tieMatchUpIdsToRemove_1), false));
+                matchUp.tieMatchUps = matchUp.tieMatchUps.filter(function (_a) {
+                    var matchUpId = _a.matchUpId;
+                    return !tieMatchUpIdsToRemove_1.includes(matchUpId);
+                });
+            }
+        });
+        matchUpsAdded.length &&
+            addMatchUpsNotice({
+                matchUps: matchUpsAdded,
+                drawDefinition: drawDefinition,
+                tournamentId: tournamentId,
+                eventId: eventId,
+            });
+        matchUpIdsRemoved.length &&
+            deleteMatchUpsNotice({
+                matchUpIds: matchUpIdsRemoved,
+                action: 'updateTieFormat',
+                drawDefinition: drawDefinition,
+                tournamentId: tournamentId,
+                eventId: eventId,
+            });
+        return { matchUpIdsRemoved: matchUpIdsRemoved, matchUpsAdded: matchUpsAdded };
+    }
+}
+function getMatchUpChangesArePossible(_a) {
+    var check = _a.check, matchUp = _a.matchUp;
+    var cannotChangeReaon = '';
+    var changes = [];
+    var changesArePossible = check.matchUpsCountChanges.every(function (_a) {
+        var collectionId = _a.collectionId, countChange = _a.countChange;
+        var toBePlayedTieMatchUpIds = matchUp.tieMatchUps
+            .filter(function (tieMatchUp) {
+            return tieMatchUp.collectionId === collectionId &&
+                tieMatchUp.matchUpStatus === TO_BE_PLAYED;
+        })
+            .map(extractAttributes('matchUpId'));
+        var possibleToChange = toBePlayedTieMatchUpIds.length + countChange >= 0 || countChange > 0;
+        if (!possibleToChange && countChange < 0)
+            cannotChangeReaon = 'Insufficient TO_BE_PLAYED matchUps';
+        changes.push({
+            toBePlayedTieMatchUpIds: toBePlayedTieMatchUpIds,
+            collectionId: collectionId,
+            countChange: countChange,
+        });
+        return possibleToChange;
+    });
+    return { changesArePossible: changesArePossible, changes: changes, cannotChangeReaon: cannotChangeReaon };
 }
 
-// all child matchUps need to be checked for collectionAssignments / collectionPositions which need to be removed when collectionDefinition.collectionIds are removed
 function modifyCollectionDefinition$1(_a) {
     var _b, _c, _d;
     var _e = _a.updateInProgressMatchUps, updateInProgressMatchUps = _e === void 0 ? false : _e, tournamentRecord = _a.tournamentRecord, collectionOrder = _a.collectionOrder, collectionName = _a.collectionName, tieFormatName = _a.tieFormatName, drawDefinition = _a.drawDefinition, matchUpFormat = _a.matchUpFormat, matchUpCount = _a.matchUpCount, collectionId = _a.collectionId, matchUpType = _a.matchUpType, structureId = _a.structureId, matchUpId = _a.matchUpId, category = _a.category, eventId = _a.eventId, gender = _a.gender, event = _a.event, 
@@ -32314,8 +32520,9 @@ function modifyCollectionDefinition$1(_a) {
     if (!Object.values(valueAssignments).filter(Boolean).length &&
         !collectionOrder &&
         !collectionName &&
+        !matchUpFormat &&
         !matchUpCount &&
-        !matchUpFormat)
+        !matchUpType)
         return decorateResult({ result: { error: MISSING_VALUE }, stack: stack });
     if (Object.values(valueAssignments).filter(Boolean).length > 1)
         return decorateResult({
@@ -32340,11 +32547,16 @@ function modifyCollectionDefinition$1(_a) {
     });
     var targetCollectionDefinition = tieFormat === null || tieFormat === void 0 ? void 0 : tieFormat.collectionDefinitions.find(function (collectionDefinition) { return collectionDefinition.collectionId === collectionId; });
     if (!sourceCollectionDefinition)
-        return decorateResult({ result: { error: NOT_FOUND }, stack: stack });
+        return decorateResult({
+            info: 'source collectionDefinition',
+            result: { error: NOT_FOUND },
+            context: { collectionId: collectionId },
+            stack: stack,
+        });
     var value = (_c = (_b = collectionValue !== null && collectionValue !== void 0 ? collectionValue : matchUpValue) !== null && _b !== void 0 ? _b : scoreValue) !== null && _c !== void 0 ? _c : setValue;
     if (collectionValueProfiles) {
-        var result_1 = validateCollectionValueProfile({
-            matchUpCount: matchUpCount || (sourceCollectionDefinition === null || sourceCollectionDefinition === void 0 ? void 0 : sourceCollectionDefinition.matchUpCount),
+        var result_1 = validateCollectionValueProfiles({
+            matchUpCount: matchUpCount !== null && matchUpCount !== void 0 ? matchUpCount : sourceCollectionDefinition === null || sourceCollectionDefinition === void 0 ? void 0 : sourceCollectionDefinition.matchUpCount,
             collectionValueProfiles: collectionValueProfiles,
         });
         if (result_1.errors) {
@@ -32442,16 +32654,11 @@ function modifyCollectionDefinition$1(_a) {
     }
     if (isConvertableInteger(matchUpCount) &&
         sourceCollectionDefinition.matchUpCount !== matchUpCount) {
-        // TODO: need to calculate tieMatchUp additions/deletions
-        // targetCollectionDefinition.matchUpCount = matchUpCount;
-        // modifications.push({ structureId, matchUpCount });
-        return decorateResult({
-            result: { error: NOT_IMPLEMENTED },
-            context: { matchUpCount: matchUpCount },
-            stack: stack,
-        });
+        targetCollectionDefinition.matchUpCount = matchUpCount;
+        modifications.push({ collectionId: collectionId, matchUpCount: matchUpCount });
     }
     if (matchUpType && sourceCollectionDefinition.matchUpType !== matchUpType) {
+        // TODO: updateTieFormat needs to support
         // targetCollectionDefinition.matchUpType = matchUpType;
         // modifications.push({ collectionId, matchUpType });
         return decorateResult({
@@ -32469,8 +32676,8 @@ function modifyCollectionDefinition$1(_a) {
         targetCollectionDefinition.gender = gender;
         modifications.push({ collectionId: collectionId, gender: gender });
     }
-    var prunedTieFormat = definedAttributes(tieFormat);
-    result = validateTieFormat({ tieFormat: prunedTieFormat });
+    var modifiedTieFormat = definedAttributes(tieFormat);
+    result = validateTieFormat({ tieFormat: modifiedTieFormat });
     if (result.error) {
         return decorateResult({ result: result, stack: stack });
     }
@@ -32482,15 +32689,15 @@ function modifyCollectionDefinition$1(_a) {
     var changedTieFormatName = (existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.tieFormatName) !== tieFormatName;
     // if tieFormat has changed, force renaming of the tieFormat
     if (changedTieFormatName) {
-        prunedTieFormat.tieFormatName = tieFormatName;
+        modifiedTieFormat.tieFormatName = tieFormatName;
         modifications.push({ tieFormatName: tieFormatName });
     }
     else if (modifications.length) {
-        delete prunedTieFormat.tieFormatName;
+        delete modifiedTieFormat.tieFormatName;
         modifications.push('tieFormatName removed: modifications without new tieFormatName');
     }
     result = updateTieFormat({
-        tieFormat: prunedTieFormat,
+        tieFormat: modifiedTieFormat,
         updateInProgressMatchUps: updateInProgressMatchUps,
         tournamentRecord: tournamentRecord,
         drawDefinition: drawDefinition,
@@ -32745,8 +32952,8 @@ function orderCollectionDefinitions(params) {
 // all child matchUps need to be checked for collectionAssignments which need to be removed when collectionDefinition.collectionIds are removed
 function removeCollectionDefinition$1(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
-    var _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    var _p = _a.updateInProgressMatchUps, updateInProgressMatchUps = _p === void 0 ? true : _p, tieFormatComparison = _a.tieFormatComparison, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, collectionId = _a.collectionId, structureId = _a.structureId, matchUpId = _a.matchUpId, eventId = _a.eventId, matchUp = _a.matchUp, event = _a.event;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _s = _a.updateInProgressMatchUps, updateInProgressMatchUps = _s === void 0 ? true : _s, tieFormatComparison = _a.tieFormatComparison, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, collectionId = _a.collectionId, structureId = _a.structureId, matchUpId = _a.matchUpId, eventId = _a.eventId, matchUp = _a.matchUp, event = _a.event;
     var stack = 'removeCollectionDefinition';
     var result = !matchUp
         ? getTieFormat$1({
@@ -32784,7 +32991,7 @@ function removeCollectionDefinition$1(_a) {
     }
     // calculate new winCriteria for tieFormat
     // if existing winCriteria is aggregateValue, retain
-    var _q = calculateWinCriteria(tieFormat), aggregateValue = _q.aggregateValue, valueGoal = _q.valueGoal;
+    var _t = calculateWinCriteria(tieFormat), aggregateValue = _t.aggregateValue, valueGoal = _t.valueGoal;
     tieFormat.winCriteria = definedAttributes({ aggregateValue: aggregateValue, valueGoal: valueGoal });
     // if valueGoal has changed, force renaming of the tieFormat
     var originalValueGoal = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.valueGoal;
@@ -32805,24 +33012,24 @@ function removeCollectionDefinition$1(_a) {
     }
     else if (structureId && structure) {
         matchUps =
-            ((_f = getAllStructureMatchUps({
+            (_g = (_f = getAllStructureMatchUps({
                 matchUpFilters: { matchUpTypes: [TEAM$2] },
                 structure: structure,
-            })) === null || _f === void 0 ? void 0 : _f.matchUps) || [];
+            })) === null || _f === void 0 ? void 0 : _f.matchUps) !== null && _g !== void 0 ? _g : [];
     }
     else if (drawDefinition) {
         matchUps =
-            ((_g = allDrawMatchUps$1({
+            (_j = (_h = allDrawMatchUps$1({
                 matchUpFilters: { matchUpTypes: [TEAM$2] },
                 drawDefinition: drawDefinition,
-            })) === null || _g === void 0 ? void 0 : _g.matchUps) || [];
+            })) === null || _h === void 0 ? void 0 : _h.matchUps) !== null && _j !== void 0 ? _j : [];
     }
     else if (event) {
         matchUps =
-            ((_h = allEventMatchUps({
+            (_l = (_k = allEventMatchUps({
                 matchUpFilters: { matchUpTypes: [TEAM$2] },
                 drawDefinition: drawDefinition,
-            })) === null || _h === void 0 ? void 0 : _h.matchUps) || [];
+            })) === null || _k === void 0 ? void 0 : _k.matchUps) !== null && _l !== void 0 ? _l : [];
     }
     // all team matchUps in scope which are completed or which have a score should not be modified
     // UNLESS all collectionMatchUps have no score
@@ -32848,10 +33055,10 @@ function removeCollectionDefinition$1(_a) {
         return { error: NO_MODIFICATIONS_APPLIED };
     }
     if (matchUpId && matchUp && updateInProgressMatchUps) {
-        var collectionMatchUps = (_j = matchUp.tieMatchUps) === null || _j === void 0 ? void 0 : _j.filter(function (tieMatchUp) { return tieMatchUp.collectionId === collectionId; });
+        var collectionMatchUps = (_m = matchUp.tieMatchUps) === null || _m === void 0 ? void 0 : _m.filter(function (tieMatchUp) { return tieMatchUp.collectionId === collectionId; });
         try {
-            for (var _r = __values(collectionMatchUps !== null && collectionMatchUps !== void 0 ? collectionMatchUps : []), _s = _r.next(); !_s.done; _s = _r.next()) {
-                var collectionMatchUp = _s.value;
+            for (var _u = __values(collectionMatchUps !== null && collectionMatchUps !== void 0 ? collectionMatchUps : []), _v = _u.next(); !_v.done; _v = _u.next()) {
+                var collectionMatchUp = _v.value;
                 var result_1 = setMatchUpStatus$2({
                     matchUpId: collectionMatchUp.matchUpId,
                     tieMatchUpId: matchUp === null || matchUp === void 0 ? void 0 : matchUp.matchUpId,
@@ -32875,7 +33082,7 @@ function removeCollectionDefinition$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_s && !_s.done && (_b = _r.return)) _b.call(_r);
+                if (_v && !_v.done && (_b = _u.return)) _b.call(_u);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -32886,9 +33093,9 @@ function removeCollectionDefinition$1(_a) {
             var matchUp_1 = targetMatchUps_1_1.value;
             try {
                 // remove any collectionAssignments from LineUps that include collectionId
-                for (var _t = (e_3 = void 0, __values((_k = matchUp_1 === null || matchUp_1 === void 0 ? void 0 : matchUp_1.sides) !== null && _k !== void 0 ? _k : [])), _u = _t.next(); !_u.done; _u = _t.next()) {
-                    var side = _u.value;
-                    side.lineUp = ((_l = side.lineUp) !== null && _l !== void 0 ? _l : []).map(function (assignment) {
+                for (var _w = (e_3 = void 0, __values((_o = matchUp_1 === null || matchUp_1 === void 0 ? void 0 : matchUp_1.sides) !== null && _o !== void 0 ? _o : [])), _x = _w.next(); !_x.done; _x = _w.next()) {
+                    var side = _x.value;
+                    side.lineUp = ((_p = side.lineUp) !== null && _p !== void 0 ? _p : []).map(function (assignment) {
                         var _a;
                         return ({
                             participantId: assignment.participantId,
@@ -32902,12 +33109,12 @@ function removeCollectionDefinition$1(_a) {
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (_u && !_u.done && (_d = _t.return)) _d.call(_t);
+                    if (_x && !_x.done && (_d = _w.return)) _d.call(_w);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
             // delete any tieMatchUps that contain collectionId
-            matchUp_1.tieMatchUps = ((_m = matchUp_1.tieMatchUps) !== null && _m !== void 0 ? _m : []).filter(function (matchUp) {
+            matchUp_1.tieMatchUps = ((_q = matchUp_1.tieMatchUps) !== null && _q !== void 0 ? _q : []).filter(function (matchUp) {
                 var deleteTarget = matchUp.collectionId === collectionId;
                 if (deleteTarget)
                     deletedMatchUpIds.push(matchUp.matchUpId);
@@ -32976,7 +33183,7 @@ function removeCollectionDefinition$1(_a) {
     }
     modifyDrawNotice({ drawDefinition: drawDefinition, eventId: event === null || event === void 0 ? void 0 : event.eventId });
     var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord }).appliedPolicies;
-    if ((_o = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _o === void 0 ? void 0 : _o[TIE_FORMAT_MODIFICATIONS]) {
+    if ((_r = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _r === void 0 ? void 0 : _r[TIE_FORMAT_MODIFICATIONS]) {
         var auditData = definedAttributes({
             drawId: drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.drawId,
             action: stack,
@@ -32994,37 +33201,6 @@ function removeCollectionDefinition(params) {
     return resolveTournamentRecord(__assign(__assign({}, params), { method: removeCollectionDefinition$1 }));
 }
 
-function generateTieMatchUps(_a) {
-    var tieFormat = _a.tieFormat, isMock = _a.isMock, uuids = _a.uuids;
-    var collectionDefinitions = (tieFormat || {}).collectionDefinitions;
-    var tieMatchUps = (collectionDefinitions || [])
-        .map(function (collectionDefinition) {
-        return generateCollectionMatchUps({ collectionDefinition: collectionDefinition, uuids: uuids, isMock: isMock });
-    })
-        .filter(Boolean)
-        .flat();
-    return { tieMatchUps: tieMatchUps };
-}
-function generateCollectionMatchUps(_a) {
-    var collectionDefinition = _a.collectionDefinition, matchUpsLimit = _a.matchUpsLimit, // internal use allows generation of missing matchUps on "reset"
-    isMock = _a.isMock, uuids = _a.uuids;
-    var _b = collectionDefinition || {}, matchUpCount = _b.matchUpCount, matchUpType = _b.matchUpType, collectionId = _b.collectionId, processCodes = _b.processCodes;
-    var numberToGenerate = matchUpsLimit || matchUpCount || 0;
-    return generateRange(0, numberToGenerate).map(function (index) {
-        var collectionPosition = index + 1;
-        return {
-            sides: [{ sideNumber: 1 }, { sideNumber: 2 }],
-            matchUpId: (uuids === null || uuids === void 0 ? void 0 : uuids.pop()) || UUID(),
-            matchUpStatus: MatchUpStatusEnum.ToBePlayed,
-            collectionPosition: collectionPosition,
-            collectionId: collectionId,
-            processCodes: processCodes,
-            matchUpType: matchUpType,
-            isMock: isMock,
-        };
-    });
-}
-
 function addCollectionDefinition$1(_a) {
     var e_1, _b, e_2, _c, _d, e_3, _e;
     var _f, _g, _h, _j, _k, _l, _m;
@@ -33214,7 +33390,7 @@ function addCollectionDefinition$1(_a) {
                     structure: structure_2,
                     uuids: uuids,
                 });
-                modifiedStructureIds.push(structureId);
+                modifiedStructureIds.push(structure_2.structureId);
                 addedMatchUps.push.apply(addedMatchUps, __spreadArray([], __read(result_3.newMatchUps), false));
                 targetMatchUps.push.apply(targetMatchUps, __spreadArray([], __read(result_3.targetMatchUps), false));
             }
@@ -33314,122 +33490,6 @@ function addCollectionDefinition(params) {
     return resolveTournamentRecord(__assign(__assign({}, params), { method: addCollectionDefinition$1 }));
 }
 
-function publicFindMatchUp(params) {
-    Object.assign(params, { inContext: true });
-    var _a = findMatchUp(params), matchUp = _a.matchUp, error = _a.error;
-    return { matchUp: makeDeepCopy(matchUp, true, true), error: error };
-}
-function findMatchUp(_a) {
-    var _b;
-    var participantsProfile = _a.participantsProfile, afterRecoveryTimes = _a.afterRecoveryTimes, tournamentRecord = _a.tournamentRecord, contextContent = _a.contextContent, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId, inContext = _a.inContext, eventId = _a.eventId, drawId = _a.drawId, event = _a.event;
-    if (!tournamentRecord)
-        return { error: MISSING_TOURNAMENT_RECORD };
-    if (typeof matchUpId !== 'string')
-        return { error: MISSING_MATCHUP_ID };
-    if (!drawDefinition || !event) {
-        var matchUps = allTournamentMatchUps({ tournamentRecord: tournamentRecord }).matchUps || [];
-        var inContextMatchUp = matchUps.find(function (matchUp) { return matchUp.matchUpId === matchUpId; });
-        if (!inContextMatchUp)
-            return { error: MATCHUP_NOT_FOUND };
-        // since drawEngineFindMatchUp is being used, additional context needs to be provided
-        (eventId = inContextMatchUp.eventId, drawId = inContextMatchUp.drawId);
-        (_b = findEvent({
-            tournamentRecord: tournamentRecord,
-            eventId: eventId,
-            drawId: drawId,
-        }), event = _b.event, drawDefinition = _b.drawDefinition);
-    }
-    if (!drawDefinition)
-        return { error: DRAW_DEFINITION_NOT_FOUND };
-    if (contextProfile && !contextContent)
-        contextContent = getContextContent({ tournamentRecord: tournamentRecord, contextProfile: contextProfile });
-    var additionalContext = {
-        surfaceCategory: (event === null || event === void 0 ? void 0 : event.surfaceCategory) || tournamentRecord.surfaceCategory,
-        indoorOutDoor: (event === null || event === void 0 ? void 0 : event.indoorOutdoor) || tournamentRecord.indoorOutdoor,
-        endDate: (event === null || event === void 0 ? void 0 : event.endDate) || tournamentRecord.endDate,
-        tournamentId: tournamentRecord.tournamentId,
-        eventId: eventId || (event === null || event === void 0 ? void 0 : event.eventId),
-        drawId: drawId,
-    };
-    var _c = hydrateParticipants({
-        participantsProfile: participantsProfile,
-        tournamentRecord: tournamentRecord,
-        contextProfile: contextProfile,
-        inContext: inContext,
-    }).participants, tournamentParticipants = _c === void 0 ? [] : _c;
-    var _d = findMatchUp$1({
-        context: inContext ? additionalContext : undefined,
-        tournamentParticipants: tournamentParticipants,
-        afterRecoveryTimes: afterRecoveryTimes,
-        contextContent: contextContent,
-        drawDefinition: drawDefinition,
-        contextProfile: contextProfile,
-        matchUpId: matchUpId,
-        inContext: inContext,
-        event: event,
-    }), matchUp = _d.matchUp, structure = _d.structure;
-    return { matchUp: matchUp, structure: structure, drawDefinition: drawDefinition };
-}
-
-function getTieFormat(_a) {
-    var _b, _c, _d, _e, _f;
-    var tournamentRecord = _a.tournamentRecord, // passed in automatically by tournamentEngine
-    drawDefinition = _a.drawDefinition, // passed in automatically by tournamentEngine when drawId provided
-    structureId = _a.structureId, // optional - if only the default matchUpFormat for a structure is required
-    matchUpId = _a.matchUpId, // id of matchUp for which the scoped matchUpFormat(s) are desired
-    structure = _a.structure, // optional optimization - when structure already known
-    eventId = _a.eventId, // optional - if only the default matchUpFormat for an event is required
-    drawId = _a.drawId, // avoid brute force search for matchUp
-    event = _a.event;
-    if (!tournamentRecord)
-        return { error: MISSING_TOURNAMENT_RECORD };
-    if (!drawId && !event && !structureId && !matchUpId)
-        return decorateResult({
-            result: { error: MISSING_VALUE },
-            stack: 'getTieFormat',
-        });
-    if (eventId && !event) {
-        event = (_b = tournamentRecord.events) === null || _b === void 0 ? void 0 : _b.find(function (event) { return event.eventId === eventId; });
-    }
-    var matchUpResult = findMatchUp({
-        tournamentRecord: tournamentRecord,
-        drawDefinition: drawDefinition,
-        matchUpId: matchUpId,
-        drawId: drawId,
-        event: event,
-    });
-    if (matchUpId && (matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.error)) {
-        return matchUpResult;
-    }
-    else if (!drawDefinition && (matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.drawDefinition)) {
-        drawDefinition = matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.drawDefinition;
-    }
-    structure = structure !== null && structure !== void 0 ? structure : matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.structure;
-    if (!structure && structureId && !matchUpId) {
-        if (!drawDefinition)
-            return { error: MISSING_DRAW_ID };
-        var structureResult = findStructure({ drawDefinition: drawDefinition, structureId: structureId });
-        if (structureResult.error)
-            return structureResult;
-        structure = structureResult.structure;
-    }
-    var structureDefaultTieFormat = ((structure === null || structure === void 0 ? void 0 : structure.tieFormat) || (structure === null || structure === void 0 ? void 0 : structure.tieFormatId)) &&
-        ((_c = resolveTieFormat({ structure: structure, drawDefinition: drawDefinition, event: event })) === null || _c === void 0 ? void 0 : _c.tieFormat);
-    var drawDefaultTieFormat = ((drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.tieFormat) || (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.tieFormatId)) &&
-        ((_d = resolveTieFormat({
-            drawDefinition: drawDefinition,
-            event: event,
-        })) === null || _d === void 0 ? void 0 : _d.tieFormat);
-    var eventDefaultTieFormat = (_e = resolveTieFormat({ event: event })) === null || _e === void 0 ? void 0 : _e.tieFormat;
-    var tieFormat = (_f = resolveTieFormat({
-        matchUp: matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.matchUp,
-        drawDefinition: drawDefinition,
-        structure: structure,
-        event: event,
-    })) === null || _f === void 0 ? void 0 : _f.tieFormat;
-    return __assign(__assign({}, SUCCESS), { matchUp: matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.matchUp, structureDefaultTieFormat: structureDefaultTieFormat, eventDefaultTieFormat: eventDefaultTieFormat, drawDefaultTieFormat: drawDefaultTieFormat, tieFormat: tieFormat, structure: structure });
-}
-
 function updateTargetTeamMatchUps(_a) {
     var e_1, _b;
     var updateInProgressMatchUps = _a.updateInProgressMatchUps, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, targetMatchUps = _a.targetMatchUps, tieFormat = _a.tieFormat, event = _a.event;
@@ -33574,8 +33634,7 @@ function removeCollectionGroup$1(_a) {
         return { error: INVALID_VALUES };
     var stack = 'removeCollectionGroup';
     var result = !matchUp
-        ? getTieFormat({
-            tournamentRecord: tournamentRecord,
+        ? getTieFormat$1({
             drawDefinition: drawDefinition,
             structureId: structureId,
             matchUpId: matchUpId,
@@ -33737,11 +33796,15 @@ function addCollectionGroup(params) {
 
 function modifyTieFormat$1(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
-    var _e;
-    var _f = _a.updateInProgressMatchUps, updateInProgressMatchUps = _f === void 0 ? false : _f, tieFormatComparison = _a.tieFormatComparison, modifiedTieFormat = _a.modifiedTieFormat, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, matchUpId = _a.matchUpId, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
+    var _e = _a.updateInProgressMatchUps, updateInProgressMatchUps = _e === void 0 ? false : _e, tieFormatComparison = _a.tieFormatComparison, modifiedTieFormat = _a.modifiedTieFormat, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, matchUpId = _a.matchUpId, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
     var stack = 'updateTieFormat';
-    if (!validateTieFormat(modifiedTieFormat))
-        return { error: INVALID_TIE_FORMAT };
+    if (!validateTieFormat({ tieFormat: modifiedTieFormat }).valid) {
+        return decorateResult({
+            result: { error: INVALID_TIE_FORMAT },
+            info: 'falied validation',
+            stack: stack,
+        });
+    }
     var result = getTieFormat$1({
         drawDefinition: drawDefinition,
         structureId: structureId,
@@ -33753,8 +33816,18 @@ function modifyTieFormat$1(_a) {
         return decorateResult({ result: result, stack: stack });
     var matchUp = result.matchUp, existingTieFormat = result.tieFormat;
     var tieFormat = copyTieFormat(existingTieFormat);
-    if (!((_e = compareTieFormats({ ancestor: tieFormat, descendant: modifiedTieFormat })) === null || _e === void 0 ? void 0 : _e.different)) {
-        return __assign({}, SUCCESS);
+    var comparison = compareTieFormats({
+        descendant: modifiedTieFormat,
+        ancestor: tieFormat,
+    });
+    if (comparison.invalid) {
+        return decorateResult({
+            context: { invalid: comparison.invalid },
+            result: { error: INVALID_TIE_FORMAT },
+        });
+    }
+    if (!(comparison === null || comparison === void 0 ? void 0 : comparison.different)) {
+        return decorateResult({ result: __assign({}, SUCCESS), info: 'Nothing to do' });
     }
     var existingCollectionIds = tieFormat.collectionDefinitions.map(function (_a) {
         var collectionId = _a.collectionId;
@@ -33769,14 +33842,17 @@ function modifyTieFormat$1(_a) {
         var collectionId = _a.collectionId;
         return !existingCollectionIds.includes(collectionId);
     });
+    var addedCollectionIds = addedCollectionDefinitions.map(extractAttributes('collectionId'));
     var modifications = [];
     var processedTieFormat;
+    var tieFormatName = modifiedTieFormat.tieFormatName;
     try {
-        // TODO: if matchUpCount is changing pre-check for cmopleted tieMatchUps
         // TODO: if gender is changing pre-check for misgendered collectionAssignments
-        for (var _g = __values(modifiedTieFormat.collectionDefinitions), _h = _g.next(); !_h.done; _h = _g.next()) {
-            var collectionDefinition = _h.value;
-            var result_1 = modifyCollectionDefinition$1(__assign(__assign({ updateInProgressMatchUps: updateInProgressMatchUps }, collectionDefinition), { tournamentRecord: tournamentRecord, drawDefinition: drawDefinition, structureId: structureId, matchUpId: matchUpId, eventId: eventId, event: event }));
+        for (var _f = __values(modifiedTieFormat.collectionDefinitions), _g = _f.next(); !_g.done; _g = _f.next()) {
+            var collectionDefinition = _g.value;
+            if (addedCollectionIds.includes(collectionDefinition.collectionId))
+                continue;
+            var result_1 = modifyCollectionDefinition$1(__assign(__assign({ updateInProgressMatchUps: updateInProgressMatchUps }, collectionDefinition), { tournamentRecord: tournamentRecord, tieFormatName: tieFormatName, drawDefinition: drawDefinition, structureId: structureId, matchUpId: matchUpId, eventId: eventId, event: event }));
             if (result_1.modifications)
                 modifications.push.apply(modifications, __spreadArray([], __read(result_1.modifications), false));
             if (result_1.error)
@@ -33788,11 +33864,10 @@ function modifyTieFormat$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 (_g && !_g.done && (_b = _f.return)) _b.call(_f);
         }
         finally { if (e_1) throw e_1.error; }
     }
-    var tieFormatName = modifiedTieFormat.tieFormatName;
     try {
         for (var addedCollectionDefinitions_1 = __values(addedCollectionDefinitions), addedCollectionDefinitions_1_1 = addedCollectionDefinitions_1.next(); !addedCollectionDefinitions_1_1.done; addedCollectionDefinitions_1_1 = addedCollectionDefinitions_1.next()) {
             var collectionDefinition = addedCollectionDefinitions_1_1.value;
@@ -33857,7 +33932,9 @@ function modifyTieFormat$1(_a) {
         processedTieFormat.tieFormatName = tieFormatName;
         modifications.push({ tieFormatName: tieFormatName });
     }
-    else if (modifications.length) {
+    else if (modifications.length ||
+        addedCollectionIds.length ||
+        removedCollectionIds.length) {
         delete processedTieFormat.tieFormatName;
         modifications.push('tieFormatName removed: modifications without new tieFormatName');
     }
@@ -33868,13 +33945,71 @@ function modifyTieFormat$1(_a) {
                 numericSortValue(b.collectionOrder);
         })
             .map(function (def, i) { return (__assign(__assign({}, def), { collectionOrder: i + 1 })); });
-    return __assign(__assign({}, SUCCESS), { processedTieFormat: processedTieFormat, modifications: modifications });
+    return __assign({ processedTieFormat: copyTieFormat(processedTieFormat), modifications: modifications }, SUCCESS);
 }
 
 function modifyTieFormat(params) {
     return resolveTournamentRecord(__assign(__assign({}, params), { method: modifyTieFormat$1 }));
 }
 
+function publicFindMatchUp(params) {
+    Object.assign(params, { inContext: true });
+    var _a = findMatchUp(params), matchUp = _a.matchUp, error = _a.error;
+    return { matchUp: makeDeepCopy(matchUp, true, true), error: error };
+}
+function findMatchUp(_a) {
+    var _b;
+    var _c, _d, _e, _f;
+    var participantsProfile = _a.participantsProfile, afterRecoveryTimes = _a.afterRecoveryTimes, tournamentRecord = _a.tournamentRecord, contextContent = _a.contextContent, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId, inContext = _a.inContext, eventId = _a.eventId, drawId = _a.drawId, event = _a.event;
+    if (!tournamentRecord)
+        return { error: MISSING_TOURNAMENT_RECORD };
+    if (typeof matchUpId !== 'string')
+        return { error: MISSING_MATCHUP_ID };
+    if (!drawDefinition || !event) {
+        var matchUps = (_c = allTournamentMatchUps({ tournamentRecord: tournamentRecord }).matchUps) !== null && _c !== void 0 ? _c : [];
+        var inContextMatchUp = matchUps.find(function (matchUp) { return matchUp.matchUpId === matchUpId; });
+        if (!inContextMatchUp)
+            return { error: MATCHUP_NOT_FOUND };
+        // since drawEngineFindMatchUp is being used, additional context needs to be provided
+        (eventId = inContextMatchUp.eventId, drawId = inContextMatchUp.drawId);
+        (_b = findEvent({
+            tournamentRecord: tournamentRecord,
+            eventId: eventId,
+            drawId: drawId,
+        }), event = _b.event, drawDefinition = _b.drawDefinition);
+    }
+    if (!drawDefinition)
+        return { error: DRAW_DEFINITION_NOT_FOUND };
+    if (contextProfile && !contextContent)
+        contextContent = getContextContent({ tournamentRecord: tournamentRecord, contextProfile: contextProfile });
+    var additionalContext = {
+        surfaceCategory: (_d = event === null || event === void 0 ? void 0 : event.surfaceCategory) !== null && _d !== void 0 ? _d : tournamentRecord.surfaceCategory,
+        indoorOutDoor: (_e = event === null || event === void 0 ? void 0 : event.indoorOutdoor) !== null && _e !== void 0 ? _e : tournamentRecord.indoorOutdoor,
+        endDate: (_f = event === null || event === void 0 ? void 0 : event.endDate) !== null && _f !== void 0 ? _f : tournamentRecord.endDate,
+        tournamentId: tournamentRecord.tournamentId,
+        eventId: eventId !== null && eventId !== void 0 ? eventId : event === null || event === void 0 ? void 0 : event.eventId,
+        drawId: drawId,
+    };
+    var _g = hydrateParticipants({
+        participantsProfile: participantsProfile,
+        tournamentRecord: tournamentRecord,
+        contextProfile: contextProfile,
+        inContext: inContext,
+    }).participants, tournamentParticipants = _g === void 0 ? [] : _g;
+    var _h = findMatchUp$1({
+        context: inContext ? additionalContext : undefined,
+        tournamentParticipants: tournamentParticipants,
+        afterRecoveryTimes: afterRecoveryTimes,
+        contextContent: contextContent,
+        drawDefinition: drawDefinition,
+        contextProfile: contextProfile,
+        matchUpId: matchUpId,
+        inContext: inContext,
+        event: event,
+    }), matchUp = _h.matchUp, structure = _h.structure;
+    return { matchUp: matchUp, structure: structure, drawDefinition: drawDefinition };
+}
+
 function resetTieFormat$1(_a) {
     var e_1, _b, e_2, _c;
     var _d;
@@ -50721,10 +50856,6 @@ function removeDelegatedOutcome$1(_a) {
     });
 }
 
-function stringSort(a, b) {
-    return (a || '').localeCompare(b || '');
-}
-
 function generateCandidate(_a) {
     var _b = _a.maxIterations, maxIterations = _b === void 0 ? 4000 : _b, // cap the processing intensity of the candidate generator
     valueSortedPairings = _a.valueSortedPairings, // pairings sorted by value from low to high
@@ -64066,6 +64197,65 @@ function getParticipantSignInStatus(_a) {
     return timeItem && timeItem.itemValue === SIGNED_IN && SIGNED_IN;
 }
 
+function getTieFormat(_a) {
+    var _b, _c, _d, _e, _f;
+    var tournamentRecord = _a.tournamentRecord, // passed in automatically by tournamentEngine
+    drawDefinition = _a.drawDefinition, // passed in automatically by tournamentEngine when drawId provided
+    structureId = _a.structureId, // optional - if only the default matchUpFormat for a structure is required
+    matchUpId = _a.matchUpId, // id of matchUp for which the scoped matchUpFormat(s) are desired
+    structure = _a.structure, // optional optimization - when structure already known
+    eventId = _a.eventId, // optional - if only the default matchUpFormat for an event is required
+    drawId = _a.drawId, // avoid brute force search for matchUp
+    event = _a.event;
+    if (!tournamentRecord)
+        return { error: MISSING_TOURNAMENT_RECORD };
+    if (!drawId && !event && !structureId && !matchUpId)
+        return decorateResult({
+            result: { error: MISSING_VALUE },
+            stack: 'getTieFormat',
+        });
+    if (eventId && !event) {
+        event = (_b = tournamentRecord.events) === null || _b === void 0 ? void 0 : _b.find(function (event) { return event.eventId === eventId; });
+    }
+    var matchUpResult = publicFindMatchUp({
+        tournamentRecord: tournamentRecord,
+        drawDefinition: drawDefinition,
+        matchUpId: matchUpId,
+        drawId: drawId,
+        event: event,
+    });
+    if (matchUpId && (matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.error)) {
+        return matchUpResult;
+    }
+    else if (!drawDefinition && (matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.drawDefinition)) {
+        drawDefinition = matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.drawDefinition;
+    }
+    structure = structure !== null && structure !== void 0 ? structure : matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.structure;
+    if (!structure && structureId && !matchUpId) {
+        if (!drawDefinition)
+            return { error: MISSING_DRAW_ID };
+        var structureResult = findStructure({ drawDefinition: drawDefinition, structureId: structureId });
+        if (structureResult.error)
+            return structureResult;
+        structure = structureResult.structure;
+    }
+    var structureDefaultTieFormat = ((structure === null || structure === void 0 ? void 0 : structure.tieFormat) || (structure === null || structure === void 0 ? void 0 : structure.tieFormatId)) &&
+        ((_c = resolveTieFormat({ structure: structure, drawDefinition: drawDefinition, event: event })) === null || _c === void 0 ? void 0 : _c.tieFormat);
+    var drawDefaultTieFormat = ((drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.tieFormat) || (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.tieFormatId)) &&
+        ((_d = resolveTieFormat({
+            drawDefinition: drawDefinition,
+            event: event,
+        })) === null || _d === void 0 ? void 0 : _d.tieFormat);
+    var eventDefaultTieFormat = (_e = resolveTieFormat({ event: event })) === null || _e === void 0 ? void 0 : _e.tieFormat;
+    var tieFormat = (_f = resolveTieFormat({
+        matchUp: matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.matchUp,
+        drawDefinition: drawDefinition,
+        structure: structure,
+        event: event,
+    })) === null || _f === void 0 ? void 0 : _f.tieFormat;
+    return __assign(__assign({}, SUCCESS), { matchUp: matchUpResult === null || matchUpResult === void 0 ? void 0 : matchUpResult.matchUp, structureDefaultTieFormat: copyTieFormat(structureDefaultTieFormat), eventDefaultTieFormat: copyTieFormat(eventDefaultTieFormat), drawDefaultTieFormat: copyTieFormat(drawDefaultTieFormat), tieFormat: copyTieFormat(tieFormat), structure: structure });
+}
+
 function getEventProperties(_a) {
     var _b, _c;
     var tournamentRecord = _a.tournamentRecord, event = _a.event;