tods-competition-factory 1.7.11 → 1.7.13

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.7.11';
+    return '1.7.13';
 }
 
 /******************************************************************************
@@ -18241,7 +18241,6 @@ function compareTieFormats(_a) {
                 return collectionOrder;
             })
                 .join('|'));
-    var different = nameDifference || orderDifference || ancestorDesc !== descendantDesc;
     var descendantCollectionDefinitions = Object.assign.apply(Object, __spreadArray([{}], __read(((descendant === null || descendant === void 0 ? void 0 : descendant.collectionDefinitions) || []).map(function (collectionDefinition) {
         var _a;
         return (_a = {},
@@ -18256,8 +18255,8 @@ function compareTieFormats(_a) {
     })), false));
     descendantDifferences.collectionIds = difference(Object.keys(descendantCollectionDefinitions), Object.keys(ancestorCollectionDefinitions));
     ancestorDifferences.collectionIds = difference(Object.keys(ancestorCollectionDefinitions), Object.keys(descendantCollectionDefinitions));
-    descendantDifferences.collectionsValue = getCollectionsValue(descendantCollectionDefinitions, descendantDifferences);
-    ancestorDifferences.collectionsValue = getCollectionsValue(ancestorCollectionDefinitions, ancestorDifferences);
+    descendantDifferences.collectionsValue = getCollectionsValue(descendantCollectionDefinitions);
+    ancestorDifferences.collectionsValue = getCollectionsValue(ancestorCollectionDefinitions);
     descendantDifferences.groupsCount =
         (_c = (_b = ancestor === null || ancestor === void 0 ? void 0 : ancestor.collectionGroups) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : (0 - ((_e = (_d = descendant === null || descendant === void 0 ? void 0 : descendant.collectionGroups) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0) || 0);
     ancestorDifferences.groupsCount = descendantDifferences.groupsCount
@@ -18267,20 +18266,32 @@ function compareTieFormats(_a) {
         ancestorDifferences.collectionsValue.totalValue;
     var matchUpCountDifference = descendantDifferences.collectionsValue.totalMatchUps -
         ancestorDifferences.collectionsValue.totalMatchUps;
+    var different = nameDifference ||
+        orderDifference ||
+        ancestorDesc !== descendantDesc ||
+        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 });
 }
-function getCollectionsValue(definitions, aggregator) {
+function getCollectionsValue(definitions) {
     var totalMatchUps = 0;
-    var totalValue = aggregator.collectionIds.reduce(function (total, collectionId) {
+    var collectionIds = Object.keys(definitions);
+    var totalValue = collectionIds.reduce(function (total, collectionId) {
         var collectionDefinition = definitions[collectionId];
-        var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionValue = collectionDefinition.collectionValue, matchUpCount = collectionDefinition.matchUpCount, matchUpValue = collectionDefinition.matchUpValue;
+        var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionValue = collectionDefinition.collectionValue, matchUpCount = collectionDefinition.matchUpCount, matchUpValue = collectionDefinition.matchUpValue, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue;
         totalMatchUps += matchUpCount;
         if (collectionValueProfiles)
             return (total +
                 collectionValueProfiles.reduce(function (total, profile) { return total + profile.value; }, 0));
-        if (matchUpValue && matchUpCount)
-            return total + matchUpValue * matchUpCount;
-        return total + collectionValue;
+        if (matchUpCount) {
+            if (isConvertableInteger(matchUpValue))
+                return total + matchUpValue * matchUpCount;
+            if (isConvertableInteger(scoreValue))
+                return total + scoreValue * matchUpCount;
+            if (isConvertableInteger(setValue))
+                return total + setValue * matchUpCount;
+            return total + collectionValue;
+        }
+        return total;
     }, 0);
     return { totalValue: totalValue, totalMatchUps: totalMatchUps };
 }
@@ -31958,9 +31969,10 @@ function getCompetitionPenalties(_a) {
 }
 
 function getTieFormat$1(_a) {
-    var _b, _c;
+    var _b, _c, _d;
     var drawDefinition = _a.drawDefinition, structureId = _a.structureId, matchUpId = _a.matchUpId, structure = _a.structure, matchUp = _a.matchUp, eventId = _a.eventId, // optional - if an eventId is present only return tieFormat for event
     event = _a.event;
+    var stack = 'getTieFormat';
     var tieFormat;
     structureId = (_b = structure === null || structure === void 0 ? void 0 : structure.structureId) !== null && _b !== void 0 ? _b : structureId;
     matchUpId = (_c = matchUp === null || matchUp === void 0 ? void 0 : matchUp.matchUpId) !== null && _c !== void 0 ? _c : matchUpId;
@@ -31978,6 +31990,9 @@ function getTieFormat$1(_a) {
             });
             if (result.error)
                 return result;
+            if (((_d = result.matchUp) === null || _d === void 0 ? void 0 : _d.matchUpType) !== TEAM_MATCHUP) {
+                return decorateResult({ result: { error: INVALID_MATCHUP }, stack: stack });
+            }
             if (!structure)
                 structure = result.structure;
             if (!matchUp)
@@ -32020,7 +32035,7 @@ function getTieFormat$1(_a) {
         tieFormat = getObjectTieFormat(drawDefinition) || getObjectTieFormat(event);
     }
     if (!tieFormat)
-        return decorateResult({ result: { error: MISSING_TIE_FORMAT } });
+        return decorateResult({ result: { error: MISSING_TIE_FORMAT }, stack: stack });
     return __assign(__assign({}, SUCCESS), { tieFormat: tieFormat, matchUp: matchUp, structure: structure });
 }
 
@@ -32256,23 +32271,39 @@ function updateTieFormat(_a) {
 
 // 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;
-    var _c = _a.updateInProgressMatchUps, updateInProgressMatchUps = _c === void 0 ? false : _c, tournamentRecord = _a.tournamentRecord, collectionOrder = _a.collectionOrder, collectionName = _a.collectionName, drawDefinition = _a.drawDefinition, matchUpFormat = _a.matchUpFormat, tieFormatName = _a.tieFormatName, 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, 
+    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, 
     // value assignment, only one is allowed to have a value
     collectionValueProfiles = _a.collectionValueProfiles, collectionValue = _a.collectionValue, matchUpValue = _a.matchUpValue, scoreValue = _a.scoreValue, setValue = _a.setValue;
+    var stack = 'modifyCollectionDefinition';
     if (matchUpFormat && !isValid(matchUpFormat)) {
-        return { error: INVALID_VALUES };
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { matchUpFormat: matchUpFormat },
+            stack: stack,
+        });
     }
     if (collectionName && typeof collectionName !== 'string') {
-        return { error: INVALID_VALUES };
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { collectionName: collectionName },
+            stack: stack,
+        });
     }
     if (gender && !Object.values(genderConstants).includes(gender)) {
-        return { error: INVALID_VALUES };
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { gender: gender },
+            stack: stack,
+        });
     }
     if (category && typeof category !== 'object') {
-        return { error: INVALID_VALUES };
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { category: category },
+            stack: stack,
+        });
     }
-    var stack = 'modifyCollectionDefinition';
     var valueAssignments = {
         collectionValueProfiles: collectionValueProfiles,
         collectionValue: collectionValue,
@@ -32288,10 +32319,8 @@ function modifyCollectionDefinition$1(_a) {
         return decorateResult({ result: { error: MISSING_VALUE }, stack: stack });
     if (Object.values(valueAssignments).filter(Boolean).length > 1)
         return decorateResult({
-            result: {
-                info: 'Only one value assignment allowed per collectionDefinition',
-                error: INVALID_VALUES,
-            },
+            info: 'Only one value assignment allowed per collectionDefinition',
+            result: { error: INVALID_VALUES },
             stack: stack,
         });
     var result = getTieFormat$1({
@@ -32301,42 +32330,73 @@ function modifyCollectionDefinition$1(_a) {
         eventId: eventId,
         event: event,
     });
-    if (result.error)
+    if (result.error) {
         return decorateResult({ result: result, stack: stack });
+    }
     var matchUp = result.matchUp, structure = result.structure, existingTieFormat = result.tieFormat;
     var tieFormat = copyTieFormat(existingTieFormat);
-    var collectionDefinition = tieFormat.collectionDefinitions.find(function (collectionDefinition) { return collectionDefinition.collectionId === collectionId; });
-    if (!collectionDefinition)
+    var sourceCollectionDefinition = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.collectionDefinitions.find(function (collectionDefinition) {
+        return collectionDefinition.collectionId === collectionId;
+    });
+    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 });
-    var value = collectionValue || matchUpValue || scoreValue || setValue;
-    if (value || collectionValueProfiles) {
-        if (value) {
-            if (!isConvertableInteger(value))
-                return decorateResult({ result: { error: INVALID_VALUES, value: value } });
-        }
-        else if (collectionValueProfiles) {
-            var result_1 = validateCollectionValueProfile({
-                matchUpCount: collectionDefinition.matchUpCount,
-                collectionValueProfiles: collectionValueProfiles,
+    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),
+            collectionValueProfiles: collectionValueProfiles,
+        });
+        if (result_1.errors) {
+            return decorateResult({
+                result: { error: INVALID_VALUES },
+                info: result_1.errors,
+                stack: stack,
             });
-            if (result_1.errors) {
-                return decorateResult({
-                    result: { error: INVALID_VALUES, info: result_1.errors },
-                    stack: stack,
-                });
-            }
         }
+    }
+    else if (value && !isConvertableInteger(value)) {
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            info: 'value is not an integer',
+            context: { value: value },
+            stack: stack,
+        });
+    }
+    var equivalentValueProfiles = function (a, b) {
+        return intersection(Object.keys(a), Object.keys(b)).length ===
+            Object.keys(a).length &&
+            intersection(Object.values(a), Object.values(b)).length ===
+                Object.values(a).length;
+    };
+    var valueProfileModified = collectionValueProfiles &&
+        (!sourceCollectionDefinition.collectionValueProfiles ||
+            !equivalentValueProfiles(sourceCollectionDefinition.collectionValueProfiles, collectionValueProfiles));
+    var valueModified = (isConvertableInteger(collectionValue) &&
+        sourceCollectionDefinition.collectionValue !== collectionValue) ||
+        (isConvertableInteger(matchUpValue) &&
+            sourceCollectionDefinition.matchUpValue !== matchUpValue) ||
+        (isConvertableInteger(scoreValue) &&
+            sourceCollectionDefinition.scoreValue !== scoreValue) ||
+        (isConvertableInteger(setValue) &&
+            sourceCollectionDefinition.setValue !== setValue) ||
+        valueProfileModified;
+    var modifications = [];
+    if (valueModified) {
         // cleanup any previously existing value assignment
-        collectionDefinition.collectionValue = undefined;
-        collectionDefinition.matchUpValue = undefined;
-        collectionDefinition.scoreValue = undefined;
-        collectionDefinition.setValue = undefined;
+        targetCollectionDefinition.collectionValueProfiles = undefined;
+        targetCollectionDefinition.collectionValue = undefined;
+        targetCollectionDefinition.matchUpValue = undefined;
+        targetCollectionDefinition.scoreValue = undefined;
+        targetCollectionDefinition.setValue = undefined;
         // add new value assignment
-        Object.assign(collectionDefinition, valueAssignments);
+        Object.assign(targetCollectionDefinition, valueAssignments);
+        modifications.push(__assign({ collectionId: collectionId }, definedAttributes(valueAssignments)));
     }
     // must remove all collectionGroups which contain the collection which has been modified
-    if ((scoreValue || setValue) && collectionDefinition.collectionGroupNumber) {
-        var targetCollectionGroupNumber_1 = collectionDefinition.collectionGroupNumber;
+    if ((isConvertableInteger(scoreValue) || isConvertableInteger(setValue)) &&
+        targetCollectionDefinition.collectionGroupNumber) {
+        var targetCollectionGroupNumber_1 = targetCollectionDefinition.collectionGroupNumber;
         tieFormat.collectionDefinitions = tieFormat.collectionDefinitions.map(function (collectionDefinition) {
             var collectionGroupNumber = collectionDefinition.collectionGroupNumber, rest = __rest(collectionDefinition, ["collectionGroupNumber"]);
             if (collectionGroupNumber === targetCollectionGroupNumber_1) {
@@ -32350,37 +32410,85 @@ function modifyCollectionDefinition$1(_a) {
             var groupNumber = _a.groupNumber;
             return groupNumber !== targetCollectionGroupNumber_1;
         });
+        modifications.push({
+            collectionId: collectionId,
+            change: 'collectionGroupNumber removed',
+        });
     }
     // calculate new winCriteria for tieFormat
     // if existing winCriteria is aggregateValue, retain
-    var _d = calculateWinCriteria(tieFormat), aggregateValue = _d.aggregateValue, valueGoal = _d.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;
-    var wasAggregateValue = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.aggregateValue;
-    if ((originalValueGoal && originalValueGoal !== valueGoal) ||
-        (aggregateValue && !wasAggregateValue)) {
-        delete tieFormat.tieFormatName;
-    }
-    if (tieFormatName)
-        tieFormat.tieFormatName = tieFormatName;
-    if (collectionOrder)
-        collectionDefinition.collectionOrder = collectionOrder;
-    if (collectionName)
-        collectionDefinition.collectionName = collectionName;
-    if (matchUpFormat)
-        collectionDefinition.matchUpFormat = matchUpFormat;
-    // if (matchUpCount) collectionDefinition.matchUpCount = matchUpCount; // TODO: need to calculate tieMatchUp additions/deletions
-    if (matchUpType)
-        collectionDefinition.matchUpType = matchUpType;
-    if (category)
-        collectionDefinition.category = category;
-    if (gender)
-        collectionDefinition.gender = gender; // TODO: remove all inappropriately gendered participants
+    var _f = calculateWinCriteria(tieFormat), aggregateValue = _f.aggregateValue, valueGoal = _f.valueGoal;
+    var winCriteria = definedAttributes({ aggregateValue: aggregateValue, valueGoal: valueGoal });
+    if (winCriteria.aggregateValue !==
+        (existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.aggregateValue) ||
+        winCriteria.valueGoal !== (existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.valueGoal)) {
+        tieFormat.winCriteria = winCriteria;
+        modifications.push({ collectionId: collectionId, winCriteria: winCriteria });
+    }
+    if (isConvertableInteger(collectionOrder) &&
+        sourceCollectionDefinition.collectionOrder !== collectionOrder) {
+        targetCollectionDefinition.collectionOrder = collectionOrder;
+        modifications.push({ collectionId: collectionId, collectionOrder: collectionOrder });
+    }
+    if (collectionName &&
+        sourceCollectionDefinition.collectionName !== collectionName) {
+        targetCollectionDefinition.collectionName = collectionName;
+        modifications.push({ collectionId: collectionId, collectionName: collectionName });
+    }
+    if (matchUpFormat &&
+        sourceCollectionDefinition.matchUpFormat !== matchUpFormat) {
+        targetCollectionDefinition.matchUpFormat = matchUpFormat;
+        modifications.push({ collectionId: collectionId, matchUpFormat: matchUpFormat });
+    }
+    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,
+        });
+    }
+    if (matchUpType && sourceCollectionDefinition.matchUpType !== matchUpType) {
+        // targetCollectionDefinition.matchUpType = matchUpType;
+        // modifications.push({ collectionId, matchUpType });
+        return decorateResult({
+            result: { error: NOT_IMPLEMENTED },
+            context: { matchUpType: matchUpType },
+            stack: stack,
+        });
+    }
+    if (category && sourceCollectionDefinition.category !== category) {
+        targetCollectionDefinition.category = category;
+        modifications.push({ collectionId: collectionId, category: category });
+    }
+    if (gender && sourceCollectionDefinition.gender !== gender) {
+        // TODO: remove all inappropriately gendered participants
+        targetCollectionDefinition.gender = gender;
+        modifications.push({ collectionId: collectionId, gender: gender });
+    }
     var prunedTieFormat = definedAttributes(tieFormat);
     result = validateTieFormat({ tieFormat: prunedTieFormat });
-    if (result.error)
+    if (result.error) {
         return decorateResult({ result: result, stack: stack });
+    }
+    if (!modifications.length) {
+        return decorateResult({ result: __assign(__assign({}, SUCCESS), { modifications: modifications }) });
+    }
+    // Note: this logic needs to exist both here and in `modifyTieFormat`
+    // it is duplicated because this method can be called independently
+    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;
+        modifications.push({ tieFormatName: tieFormatName });
+    }
+    else if (modifications.length) {
+        delete prunedTieFormat.tieFormatName;
+        modifications.push('tieFormatName removed: modifications without new tieFormatName');
+    }
     result = updateTieFormat({
         tieFormat: prunedTieFormat,
         updateInProgressMatchUps: updateInProgressMatchUps,
@@ -32393,10 +32501,10 @@ function modifyCollectionDefinition$1(_a) {
     });
     if (!result.error) {
         var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord }).appliedPolicies;
-        if ((_b = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _b === void 0 ? void 0 : _b[TIE_FORMAT_MODIFICATIONS]) {
+        if ((_d = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _d === void 0 ? void 0 : _d[TIE_FORMAT_MODIFICATIONS]) {
             var auditData = definedAttributes({
+                collectionDefinition: targetCollectionDefinition,
                 drawId: drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.drawId,
-                collectionDefinition: collectionDefinition,
                 action: stack,
                 structureId: structureId,
                 matchUpId: matchUpId,
@@ -32405,7 +32513,7 @@ function modifyCollectionDefinition$1(_a) {
             tieFormatTelemetry({ drawDefinition: drawDefinition, auditData: auditData });
         }
     }
-    return decorateResult({ result: result, stack: stack });
+    return decorateResult({ result: __assign(__assign({}, result), { modifications: modifications }), stack: stack });
 }
 
 function resolveTournamentRecord(params) {
@@ -32965,10 +33073,10 @@ function addCollectionDefinition$1(_a) {
             return collectionId;
         });
         if (collectionIds.includes(collectionDefinition.collectionId))
-            return {
-                collectionId: collectionDefinition.collectionId,
-                error: DUPLICATE_VALUE,
-            };
+            return decorateResult({
+                context: { collectionId: collectionDefinition.collectionId },
+                result: { error: DUPLICATE_VALUE },
+            });
     }
     tieFormat.collectionDefinitions.push(collectionDefinition);
     tieFormat.collectionDefinitions
@@ -33071,7 +33179,10 @@ function addCollectionDefinition$1(_a) {
     }
     else if (matchUpId && matchUp) {
         if (!validUpdate({ matchUp: matchUp, updateInProgressMatchUps: updateInProgressMatchUps }))
-            return { error: CANNOT_MODIFY_TIEFORMAT };
+            return decorateResult({
+                result: { error: CANNOT_MODIFY_TIEFORMAT },
+                stack: stack,
+            });
         matchUp.tieFormat = prunedTieFormat;
         var newMatchUps = generateCollectionMatchUps({
             collectionDefinition: collectionDefinition,
@@ -33138,7 +33249,7 @@ function addCollectionDefinition$1(_a) {
         });
         tieFormatTelemetry({ drawDefinition: drawDefinition, auditData: auditData });
     }
-    return __assign(__assign({}, SUCCESS), { tieFormat: prunedTieFormat, targetMatchUps: targetMatchUps, addedMatchUps: addedMatchUps });
+    return __assign({ tieFormat: prunedTieFormat, targetMatchUps: targetMatchUps, addedMatchUps: addedMatchUps }, SUCCESS);
 }
 function updateStructureMatchUps(_a) {
     var e_4, _b, _c;
@@ -33626,7 +33737,8 @@ function addCollectionGroup(params) {
 
 function modifyTieFormat$1(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
-    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 _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 stack = 'updateTieFormat';
     if (!validateTieFormat(modifiedTieFormat))
         return { error: INVALID_TIE_FORMAT };
@@ -33641,35 +33753,32 @@ 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 existingCollectionIds = tieFormat.collectionDefinitions.map(function (_a) {
         var collectionId = _a.collectionId;
         return collectionId;
     });
-    var modifiedCollectionDefinitions = [];
-    var addedCollectionDefinitions = [];
-    var updatedCollectionIds = [];
-    modifiedTieFormat.collectionDefinitions.forEach(function (def) {
-        var _a;
-        updatedCollectionIds.push(def.collectionId);
-        if (modifiedTieFormat && existingCollectionIds.includes(def.collectionId)) {
-            ((_a = compareTieFormats({
-                descendant: modifiedTieFormat,
-                ancestor: tieFormat,
-            })) === null || _a === void 0 ? void 0 : _a.different) && modifiedCollectionDefinitions.push(def);
-        }
-        else {
-            addedCollectionDefinitions.push(def);
-        }
+    var updatedCollectionIds = modifiedTieFormat.collectionDefinitions.map(function (_a) {
+        var collectionId = _a.collectionId;
+        return collectionId;
     });
     var removedCollectionIds = existingCollectionIds.filter(function (collectionId) { return !updatedCollectionIds.includes(collectionId); });
-    var tieFormatName = modifiedTieFormat.tieFormatName;
+    var addedCollectionDefinitions = modifiedTieFormat.collectionDefinitions.filter(function (_a) {
+        var collectionId = _a.collectionId;
+        return !existingCollectionIds.includes(collectionId);
+    });
+    var modifications = [];
     var processedTieFormat;
     try {
         // TODO: if matchUpCount is changing pre-check for cmopleted tieMatchUps
         // TODO: if gender is changing pre-check for misgendered collectionAssignments
-        for (var modifiedCollectionDefinitions_1 = __values(modifiedCollectionDefinitions), modifiedCollectionDefinitions_1_1 = modifiedCollectionDefinitions_1.next(); !modifiedCollectionDefinitions_1_1.done; modifiedCollectionDefinitions_1_1 = modifiedCollectionDefinitions_1.next()) {
-            var collectionDefinition = modifiedCollectionDefinitions_1_1.value;
-            var result_1 = modifyCollectionDefinition$1(__assign(__assign({ updateInProgressMatchUps: updateInProgressMatchUps }, collectionDefinition), { tournamentRecord: tournamentRecord, drawDefinition: drawDefinition, tieFormatName: tieFormatName, structureId: structureId, matchUpId: matchUpId, eventId: eventId, event: event }));
+        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 }));
+            if (result_1.modifications)
+                modifications.push.apply(modifications, __spreadArray([], __read(result_1.modifications), false));
             if (result_1.error)
                 return decorateResult({ result: result_1, stack: stack });
             if (result_1.tieFormat)
@@ -33679,10 +33788,11 @@ function modifyTieFormat$1(_a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (modifiedCollectionDefinitions_1_1 && !modifiedCollectionDefinitions_1_1.done && (_b = modifiedCollectionDefinitions_1.return)) _b.call(modifiedCollectionDefinitions_1);
+            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
         }
         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;
@@ -33741,6 +33851,16 @@ function modifyTieFormat$1(_a) {
         }
         finally { if (e_3) throw e_3.error; }
     }
+    var changedTieFormatName = (existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.tieFormatName) !== tieFormatName;
+    // if tieFormat has changed, force renaming of the tieFormat
+    if (changedTieFormatName) {
+        processedTieFormat.tieFormatName = tieFormatName;
+        modifications.push({ tieFormatName: tieFormatName });
+    }
+    else if (modifications.length) {
+        delete processedTieFormat.tieFormatName;
+        modifications.push('tieFormatName removed: modifications without new tieFormatName');
+    }
     processedTieFormat.collectionDefinitions =
         processedTieFormat.collectionDefinitions
             .sort(function (a, b) {
@@ -33748,7 +33868,7 @@ function modifyTieFormat$1(_a) {
                 numericSortValue(b.collectionOrder);
         })
             .map(function (def, i) { return (__assign(__assign({}, def), { collectionOrder: i + 1 })); });
-    return __assign(__assign({}, SUCCESS), { processedTieFormat: processedTieFormat });
+    return __assign(__assign({}, SUCCESS), { processedTieFormat: processedTieFormat, modifications: modifications });
 }
 
 function modifyTieFormat(params) {
@@ -65533,6 +65653,7 @@ var lastNames = [
 	"Dallas",
 	"Diamond",
 	"Deckard",
+	"Dunbar",
 	"Earhart",
 	"Eisenstein",
 	"Eldritch",