tods-competition-factory 1.7.2 → 1.7.3

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.7.2';
+    return '1.7.3';
 }
 
 /******************************************************************************
@@ -7409,7 +7409,7 @@ function getRoundMatchUps$1(_a) {
         .map(function (key) { return ensureInt(key); })
         .filter(function (f) { return !isNaN(f); });
     roundNumbers.forEach(function (roundNumber) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         var currentRoundMatchUps = roundMatchUps[roundNumber].sort(function (a, b) { return a.roundPosition - b.roundPosition; });
         var currentRoundDrawPositions = currentRoundMatchUps
             .map(function (matchUp) { return (matchUp === null || matchUp === void 0 ? void 0 : matchUp.drawPositions) || []; })
@@ -7427,7 +7427,7 @@ function getRoundMatchUps$1(_a) {
         roundProfile[roundNumber].abbreviatedRoundName =
             (_c = finishingRoundMap[roundNumber]) === null || _c === void 0 ? void 0 : _c.abbreviatedRoundName;
         roundProfile[roundNumber].finishingPositionRange =
-            roundMatchUps[roundNumber][0].finishingPositionRange;
+            (_e = (_d = roundMatchUps[roundNumber]) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.finishingPositionRange;
         if (roundNumber === 1 || !roundProfile[roundNumber - 1]) {
             var orderedDrawPositions = currentRoundDrawPositions.sort(numericSort);
             var pairedDrawPositions = chunkArray(orderedDrawPositions, 2);
@@ -31250,10 +31250,12 @@ function getParticipantEntries(params) {
                             if (!participation)
                                 return;
                             if (!finishingPositionRange_1)
-                                finishingPositionRange_1 = participation.finishingPositionRange;
+                                finishingPositionRange_1 =
+                                    participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
                             if (diff_1(finishingPositionRange_1) >
-                                diff_1(participation.finishingPositionRange))
-                                finishingPositionRange_1 = participation.finishingPositionRange;
+                                diff_1(participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange))
+                                finishingPositionRange_1 =
+                                    participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
                             var notQualifying = participation.stage !== QUALIFYING;
                             if (notQualifying)
                                 nonQualifyingOrder_1 += 1;
@@ -31263,10 +31265,12 @@ function getParticipantEntries(params) {
                             return definedAttributes(__assign(__assign({}, participation), { participationOrder: participationOrder, flightNumber: flightNumber }));
                         })
                             .filter(Boolean);
-                        participantAggregator.draws[drawId].finishingPositionRange =
-                            finishingPositionRange_1;
-                        participantAggregator.draws[drawId].structureParticipation =
-                            orderedParticipation;
+                        if (participantAggregator.draws[drawId]) {
+                            participantAggregator.draws[drawId].finishingPositionRange =
+                                finishingPositionRange_1;
+                            participantAggregator.draws[drawId].structureParticipation =
+                                orderedParticipation;
+                        }
                     }
                 };
                 try {
@@ -47878,20 +47882,32 @@ function removeStructure(_a) {
 }
 
 function generateAdHocMatchUps$1(_a) {
-    var _b, _c, _d, _e, _f, _g;
-    var participantIdPairings = _a.participantIdPairings, _h = _a.addToStructure, addToStructure = _h === void 0 ? true : _h, tournamentRecord = _a.tournamentRecord, _j = _a.matchUpIds, matchUpIds = _j === void 0 ? [] : _j, drawDefinition = _a.drawDefinition, matchUpsCount = _a.matchUpsCount, roundNumber = _a.roundNumber, structureId = _a.structureId, newRound = _a.newRound;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var participantIdPairings = _a.participantIdPairings, _k = _a.addToStructure, addToStructure = _k === void 0 ? true : _k, tournamentRecord = _a.tournamentRecord, _l = _a.matchUpIds, matchUpIds = _l === void 0 ? [] : _l, drawDefinition = _a.drawDefinition, matchUpsCount = _a.matchUpsCount, roundNumber = _a.roundNumber, structureId = _a.structureId, newRound = _a.newRound;
     if (typeof drawDefinition !== 'object')
         return { error: MISSING_DRAW_DEFINITION };
     if (!structureId && ((_b = drawDefinition.structures) === null || _b === void 0 ? void 0 : _b.length) === 1)
         structureId = (_d = (_c = drawDefinition.structures) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.structureId;
     if (typeof structureId !== 'string')
         return { error: MISSING_STRUCTURE_ID };
-    if (newRound && !matchUpsCount) {
-        var selectedEntries = (_f = (_e = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _e === void 0 ? void 0 : _e.filter(function (entry) {
+    // if drawDefinition and structureId are provided it is possible to infer roundNumber
+    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 };
+    if (!matchUpsCount) {
+        var selectedEntries = (_g = (_f = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _f === void 0 ? void 0 : _f.filter(function (entry) {
             var entryStatus = entry.entryStatus;
             return STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
-        })) !== null && _f !== void 0 ? _f : [];
-        matchUpsCount = Math.floor((selectedEntries === null || selectedEntries === void 0 ? void 0 : selectedEntries.length) / 2) || 1;
+        })) !== null && _g !== void 0 ? _g : [];
+        var roundMatchUpsCount = Math.floor((selectedEntries === null || selectedEntries === void 0 ? void 0 : selectedEntries.length) / 2) || 1;
+        if (newRound) {
+            matchUpsCount = roundMatchUpsCount;
+        }
+        else {
+            var maxRemaining = roundMatchUpsCount - (((_h = structure.matchUps) === null || _h === void 0 ? void 0 : _h.length) || 0); // TODO: minus the number of existing matchUps in roundNumber
+            if (maxRemaining > 0)
+                matchUpsCount = maxRemaining;
+        }
     }
     if ((participantIdPairings && !Array.isArray(participantIdPairings)) ||
         (matchUpsCount && !isConvertableInteger(matchUpsCount)) ||
@@ -47899,10 +47915,8 @@ function generateAdHocMatchUps$1(_a) {
         (!participantIdPairings && !matchUpsCount)) {
         return { error: INVALID_VALUES, info: 'matchUpsCount or pairings error' };
     }
-    // if drawDefinition and structureId are provided it is possible to infer roundNumber
-    var structure = (_g = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) === null || _g === void 0 ? void 0 : _g.find(function (structure) { return structure.structureId === structureId; });
     var structureHasRoundPositions;
-    var existingMatchUps = structure === null || structure === void 0 ? void 0 : structure.matchUps;
+    var existingMatchUps = (_j = structure.matchUps) !== null && _j !== void 0 ? _j : [];
     var lastRoundNumber = existingMatchUps === null || existingMatchUps === void 0 ? void 0 : existingMatchUps.reduce(function (roundNumber, matchUp) {
         if (matchUp.roundPosition)
             structureHasRoundPositions = true;
@@ -47913,14 +47927,14 @@ function generateAdHocMatchUps$1(_a) {
     // structure must not be a container of other structures
     // structure must not contain matchUps with roundPosition
     // structure must not determine finishingPosition by ROUND_OUTCOME
-    if ((structure === null || structure === void 0 ? void 0 : structure.structures) ||
+    if (structure.structures ||
         structureHasRoundPositions ||
-        (structure === null || structure === void 0 ? void 0 : structure.finishingPosition) === ROUND_OUTCOME) {
+        structure.finishingPosition === ROUND_OUTCOME) {
         return { error: INVALID_STRUCTURE };
     }
     if (roundNumber && roundNumber - 1 > (lastRoundNumber || 0))
         return { error: INVALID_VALUES, info: 'roundNumber error' };
-    var nextRoundNumber = roundNumber !== null && roundNumber !== void 0 ? roundNumber : (newRound ? (lastRoundNumber !== null && lastRoundNumber !== void 0 ? lastRoundNumber : 0) + 1 : lastRoundNumber !== null && lastRoundNumber !== void 0 ? lastRoundNumber : 1);
+    var nextRoundNumber = roundNumber !== null && roundNumber !== void 0 ? roundNumber : ((newRound && (lastRoundNumber !== null && lastRoundNumber !== void 0 ? lastRoundNumber : 0) + 1) || lastRoundNumber || 1);
     participantIdPairings =
         participantIdPairings !== null && participantIdPairings !== void 0 ? participantIdPairings : generateRange(0, matchUpsCount).map(function () { return ({
             participantIds: [undefined, undefined],