tods-competition-factory 2.0.1 → 2.0.2

package/dist/tods-competition-factory.d.ts

@@ -2901,10 +2901,10 @@ type DeleteAdHocMatchUpsArgs = {
     tournamentRecord?: Tournament;
     drawDefinition: DrawDefinition;
     matchUpIds?: string[];
-    structureId: string;
+    structureId?: string;
     event?: Event$1;
 };
-declare function deleteAdHocMatchUps({ tournamentRecord, matchUpIds, drawDefinition, structureId, event, }: DeleteAdHocMatchUpsArgs): {
+declare function deleteAdHocMatchUps(params: DeleteAdHocMatchUpsArgs): {
     error: {
         message: string;
         code: string;
@@ -2939,11 +2939,12 @@ declare function updateTeamLineUp({ drawDefinition, participantId, tieFormat, li
     error?: ErrorType;
 };
 
-declare function addAdHocMatchUps({ tournamentRecord, drawDefinition, structureId, matchUps }: {
+declare function addAdHocMatchUps({ tournamentRecord, drawDefinition, structureId, matchUps, event }: {
     tournamentRecord: any;
     drawDefinition: any;
     structureId: any;
     matchUps: any;
+    event: any;
 }): ResultType;
 
 type ModifyDrawNameArgs = {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.0.1';
+    return '2.0.2';
 }
 
 /******************************************************************************
@@ -3966,15 +3966,13 @@ function drawUpdatedAt(drawDefinition, structureIds) {
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     var timeStamp = Date.now();
-    if (drawDefinition.updatedAt &&
-        timeStamp === new Date(drawDefinition.updatedAt).getTime())
+    if (drawDefinition.updatedAt && timeStamp === new Date(drawDefinition.updatedAt).getTime())
         timeStamp += 1;
     var updatedAt = new Date(timeStamp).toISOString();
     var relevantStructureIds = structureIds === null || structureIds === void 0 ? void 0 : structureIds.filter(Boolean);
     drawDefinition.updatedAt = updatedAt;
     (_a = drawDefinition.structures) === null || _a === void 0 ? void 0 : _a.filter(Boolean).forEach(function (structure) {
-        if (!(relevantStructureIds === null || relevantStructureIds === void 0 ? void 0 : relevantStructureIds.length) ||
-            (relevantStructureIds === null || relevantStructureIds === void 0 ? void 0 : relevantStructureIds.includes(structure.structureId))) {
+        if (!(relevantStructureIds === null || relevantStructureIds === void 0 ? void 0 : relevantStructureIds.length) || (relevantStructureIds === null || relevantStructureIds === void 0 ? void 0 : relevantStructureIds.includes(structure.structureId))) {
             structure.updatedAt = updatedAt;
         }
     });
@@ -26406,21 +26404,16 @@ function pruneDrawDefinition(_a) {
             var structureId = _a.structureId;
             return mainStructure_1.structureId === structureId;
         });
-        var matchUps = (_b = mainStructure_1.matchUps) !== null && _b !== void 0 ? _b : [];
-        relevantMatchUps = matchUps
-            .sort(function (a, b) { return a.roundPosition - b.roundPosition; })
-            .filter(function (_a) {
+        var matchUps = ((_b = mainStructure_1.matchUps) !== null && _b !== void 0 ? _b : []).sort(function (a, b) { return a.roundPosition - b.roundPosition; });
+        relevantMatchUps = matchUps.filter(function (_a) {
             var roundNumber = _a.roundNumber;
             return !structureData_1.inactiveRounds.includes(roundNumber);
         });
         var relevantMatchUpIds_1 = relevantMatchUps.map(getMatchUpId);
-        var deletedMatchUpIds = matchUps
-            .map(getMatchUpId)
-            .filter(function (matchUpId) { return !relevantMatchUpIds_1.includes(matchUpId); });
+        var deletedMatchUpIds = matchUps.map(getMatchUpId).filter(function (matchUpId) { return !relevantMatchUpIds_1.includes(matchUpId); });
         // only ifMatchPlay can the positionAssignments be reallocated
         if (isMatchPlay) {
             var matchPlayMatchUps = relevantMatchUps
-                .sort(function (a, b) { return a.roundPosition - b.roundPosition; })
                 .filter(function (_a) {
                 var roundNumber = _a.roundNumber;
                 return !structureData_1.inactiveRounds.includes(roundNumber);
@@ -26451,9 +26444,7 @@ function pruneDrawDefinition(_a) {
                 }
             });
             if (matchPlayDrawPositions) {
-                var updatedPositionAssignments = (_c = mainStructure_1 === null || mainStructure_1 === void 0 ? void 0 : mainStructure_1.positionAssignments) === null || _c === void 0 ? void 0 : _c.filter(function (assignment) {
-                    return existingDrawPositions_1.includes(assignment.drawPosition);
-                }).map(function (assignment) {
+                var updatedPositionAssignments = (_c = mainStructure_1 === null || mainStructure_1 === void 0 ? void 0 : mainStructure_1.positionAssignments) === null || _c === void 0 ? void 0 : _c.filter(function (assignment) { return existingDrawPositions_1.includes(assignment.drawPosition); }).map(function (assignment) {
                     assignment.drawPosition = drawPositionsMap_1[assignment.drawPosition];
                     return assignment;
                 });
@@ -26512,17 +26503,21 @@ function assignDrawPosition(_a) {
     return __assign({}, SUCCESS);
 }
 
-function deleteAdHocMatchUps(_a) {
-    var e_1, _b;
-    var _c, _d, _e, _f, _g;
-    var tournamentRecord = _a.tournamentRecord, _h = _a.matchUpIds, matchUpIds = _h === void 0 ? [] : _h, drawDefinition = _a.drawDefinition, structureId = _a.structureId, event = _a.event;
+function deleteAdHocMatchUps(params) {
+    var e_1, _a;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var tournamentRecord = params.tournamentRecord, _k = params.matchUpIds, matchUpIds = _k === void 0 ? [] : _k, drawDefinition = params.drawDefinition, event = params.event;
     if (typeof drawDefinition !== 'object')
         return { error: MISSING_DRAW_DEFINITION };
-    if (typeof structureId !== 'string')
-        return { error: MISSING_STRUCTURE_ID };
     if (!Array.isArray(matchUpIds))
         return { error: INVALID_VALUES };
-    var structure = (_c = drawDefinition.structures) === null || _c === void 0 ? void 0 : _c.find(function (structure) { return structure.structureId === structureId; });
+    var structureId = (_b = params.structureId) !== null && _b !== void 0 ? _b : (_d = (_c = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _c === void 0 ? void 0 : _c.find(function (structure) { var _a; return (_a = structure.matchUps) === null || _a === void 0 ? void 0 : _a.some(function (_a) {
+        var matchUpId = _a.matchUpId;
+        return matchUpIds.includes(matchUpId);
+    }); })) === null || _d === void 0 ? void 0 : _d.structureId;
+    if (!structureId)
+        return { error: STRUCTURE_NOT_FOUND };
+    var structure = (_e = drawDefinition.structures) === null || _e === void 0 ? void 0 : _e.find(function (structure) { return structure.structureId === structureId; });
     if (!structure)
         return { error: STRUCTURE_NOT_FOUND };
     var existingMatchUps = structure === null || structure === void 0 ? void 0 : structure.matchUps;
@@ -26531,21 +26526,28 @@ function deleteAdHocMatchUps(_a) {
         return { error: INVALID_STRUCTURE };
     }
     var matchUpIdsWithScoreValue = [];
-    var matchUpsToDelete = (_d = existingMatchUps === null || existingMatchUps === void 0 ? void 0 : existingMatchUps.filter(function (_a) {
+    var matchUpsToDelete = (_f = existingMatchUps === null || existingMatchUps === void 0 ? void 0 : existingMatchUps.filter(function (_a) {
         var matchUpId = _a.matchUpId, score = _a.score;
         if (checkScoreHasValue({ score: score }))
             matchUpIdsWithScoreValue.push(matchUpId);
         return matchUpIds.includes(matchUpId);
-    })) !== null && _d !== void 0 ? _d : [];
-    var matchUpIdsToDelete = matchUpsToDelete.map(xa('matchUpId'));
+    })) !== null && _f !== void 0 ? _f : [];
+    var matchUpIdsToDelete = matchUpsToDelete.map(getMatchUpId);
+    var tieMatchUpIdsToDelete = matchUpsToDelete
+        .map(function (_a) {
+        var tieMatchUps = _a.tieMatchUps;
+        return tieMatchUps === null || tieMatchUps === void 0 ? void 0 : tieMatchUps.map(getMatchUpId);
+    })
+        .filter(Boolean)
+        .flat();
     if (matchUpIdsToDelete.length) {
-        structure.matchUps = ((_e = structure.matchUps) !== null && _e !== void 0 ? _e : []).filter(function (_a) {
+        structure.matchUps = ((_g = structure.matchUps) !== null && _g !== void 0 ? _g : []).filter(function (_a) {
             var matchUpId = _a.matchUpId;
             return !matchUpIdsToDelete.includes(matchUpId);
         });
         deleteMatchUpsNotice({
             tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
-            matchUpIds: matchUpIdsToDelete,
+            matchUpIds: __spreadArray(__spreadArray([], __read(tieMatchUpIdsToDelete), false), __read(matchUpIdsToDelete), false),
             action: 'deleteAdHocMatchUps',
             eventId: event === null || event === void 0 ? void 0 : event.eventId,
             drawDefinition: drawDefinition,
@@ -26577,7 +26579,7 @@ function deleteAdHocMatchUps(_a) {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (missingRoundNumbers_1_1 && !missingRoundNumbers_1_1.done && (_b = missingRoundNumbers_1.return)) _b.call(missingRoundNumbers_1);
+                    if (missingRoundNumbers_1_1 && !missingRoundNumbers_1_1.done && (_a = missingRoundNumbers_1.return)) _a.call(missingRoundNumbers_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -26586,7 +26588,7 @@ function deleteAdHocMatchUps(_a) {
             structure.positionAssignments = unique(structure.matchUps
                 .flatMap(function (matchUp) { var _a; return ((_a = matchUp.sides) !== null && _a !== void 0 ? _a : []).map(function (side) { return side.participantId; }); })
                 .filter(Boolean)).map(function (participantId) { return ({ participantId: participantId }); });
-            var matchUpFormat = (_g = (_f = structure === null || structure === void 0 ? void 0 : structure.matchUpFormat) !== null && _f !== void 0 ? _f : drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.matchUpFormat) !== null && _g !== void 0 ? _g : event === null || event === void 0 ? void 0 : event.matchUpFormat;
+            var matchUpFormat = (_j = (_h = structure === null || structure === void 0 ? void 0 : structure.matchUpFormat) !== null && _h !== void 0 ? _h : drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.matchUpFormat) !== null && _j !== void 0 ? _j : event === null || event === void 0 ? void 0 : event.matchUpFormat;
             var result = updateAssignmentParticipantResults({
                 positionAssignments: structure.positionAssignments,
                 matchUps: structure.matchUps,
@@ -26641,11 +26643,11 @@ function removeRoundMatchUps(_a) {
     }
     return __assign({}, SUCCESS);
 }
-// TODO: move to drawEngine and passthrough
 function removeAdHocRound(_a) {
     var _b;
     var removeCompletedMatchUps = _a.removeCompletedMatchUps, drawDefinition = _a.drawDefinition, tournamentId = _a.tournamentId, roundNumber = _a.roundNumber, structure = _a.structure, eventId = _a.eventId;
     var matchUps = (_b = structure === null || structure === void 0 ? void 0 : structure.matchUps) !== null && _b !== void 0 ? _b : [];
+    var deletedTieMatchUpIds = [];
     var deletedMatchUpIds = [];
     var roundRemoved = false;
     var roundNumbers = matchUps
@@ -26660,13 +26662,17 @@ function removeAdHocRound(_a) {
         var updatedMatchUps = matchUps.filter(function (matchUp) {
             var target = matchUp.roundNumber === roundNumber &&
                 (!completedMatchUpStatuses.includes(matchUp.matchUpStatus) || removeCompletedMatchUps);
-            if (target)
+            if (target) {
                 deletedMatchUpIds.push(matchUp.matchUpId);
+                if (matchUp.tieMatchUps) {
+                    deletedTieMatchUpIds.push.apply(deletedTieMatchUpIds, __spreadArray([], __read(matchUp.tieMatchUps.map(getMatchUpId)), false));
+                }
+            }
             return !target;
         });
         if (deletedMatchUpIds.length) {
             deleteMatchUpsNotice({
-                matchUpIds: deletedMatchUpIds,
+                matchUpIds: __spreadArray(__spreadArray([], __read(deletedTieMatchUpIds), false), __read(deletedMatchUpIds), false),
                 drawDefinition: drawDefinition,
                 tournamentId: tournamentId,
                 eventId: eventId,
@@ -26695,7 +26701,7 @@ function removeAdHocRound(_a) {
 function addAdHocMatchUps(_a) {
     var _b;
     var _c, _d, _e, _f, _g, _h, _j;
-    var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, matchUps = _a.matchUps;
+    var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, matchUps = _a.matchUps, event = _a.event;
     if (typeof drawDefinition !== 'object')
         return { error: MISSING_DRAW_DEFINITION };
     if (!structureId && ((_c = drawDefinition.structures) === null || _c === void 0 ? void 0 : _c.length) === 1)
@@ -26724,10 +26730,18 @@ function addAdHocMatchUps(_a) {
         };
     }
     (_b = structure.matchUps).push.apply(_b, __spreadArray([], __read(matchUps), false));
+    var tieMatchUps = matchUps
+        .map(function (_a) {
+        var tieMatchUps = _a.tieMatchUps;
+        return tieMatchUps;
+    })
+        .filter(Boolean)
+        .flat();
     addMatchUpsNotice({
         tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
+        matchUps: __spreadArray(__spreadArray([], __read(tieMatchUps), false), __read(matchUps), false),
+        eventId: event === null || event === void 0 ? void 0 : event.eventId,
         drawDefinition: drawDefinition,
-        matchUps: matchUps,
     });
     modifyDrawNotice({ drawDefinition: drawDefinition, structureIds: [structureId] });
     return __assign({}, SUCCESS);
@@ -32989,6 +33003,7 @@ function generateDrawDefinition(params) {
                     tournamentRecord: tournamentRecord,
                     drawDefinition: drawDefinition,
                     structureId: structureId_1,
+                    event: event,
                 });
             }
             else {
@@ -33006,6 +33021,7 @@ function generateDrawDefinition(params) {
                         drawDefinition: drawDefinition,
                         structureId: structureId,
                         matchUps: matchUps,
+                        event: event,
                     });
                 });
             }
@@ -65115,10 +65131,10 @@ function asyncEngineInvoke(engine, args) {
     });
 }
 
-function importMethods(engine, engineInvoke, submittedMethods, collections, maxDepth) {
+function importMethods(engine, engineInvoke, submittedMethods, traverse, maxDepth) {
     if (!isObject(submittedMethods))
         return { error: INVALID_VALUES };
-    var collectionFilter = Array.isArray(collections) ? collections : [];
+    var collectionFilter = Array.isArray(traverse) ? traverse : [];
     var methods = {};
     var attrWalker = function (obj, depth) {
         if (depth === void 0) { depth = 0; }
@@ -65127,7 +65143,7 @@ function importMethods(engine, engineInvoke, submittedMethods, collections, maxD
                 methods[key] = obj[key];
             }
             else if (isObject(obj[key]) &&
-                (collections === true || (collectionFilter === null || collectionFilter === void 0 ? void 0 : collectionFilter.includes(key))) &&
+                (traverse === true || (collectionFilter === null || collectionFilter === void 0 ? void 0 : collectionFilter.includes(key))) &&
                 (maxDepth === undefined || depth < maxDepth)) {
                 attrWalker(obj[key], depth + 1);
             }