tods-competition-factory 1.6.21 → 1.6.23

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.6.21';
+    return '1.6.23';
 }
 
 /******************************************************************************
@@ -10625,15 +10625,15 @@ function targetByRoundOutcome(_a) {
         matchUp: matchUp,
         targetLinks: { loserTargetLink: loserTargetLink, winnerTargetLink: winnerTargetLink, byeTargetLink: byeTargetLink },
         targetMatchUps: {
-            byeMatchUp: byeMatchUp,
-            loserMatchUp: loserMatchUp,
-            winnerMatchUp: winnerMatchUp,
-            byeTargetDrawPosition: byeTargetDrawPosition,
-            loserTargetDrawPosition: loserTargetDrawPosition,
-            winnerTargetDrawPosition: winnerTargetDrawPosition,
-            byeMatchUpDrawPositionIndex: byeMatchUpDrawPositionIndex,
-            loserMatchUpDrawPositionIndex: loserMatchUpDrawPositionIndex,
             winnerMatchUpDrawPositionIndex: winnerMatchUpDrawPositionIndex,
+            loserMatchUpDrawPositionIndex: loserMatchUpDrawPositionIndex,
+            byeMatchUpDrawPositionIndex: byeMatchUpDrawPositionIndex,
+            winnerTargetDrawPosition: winnerTargetDrawPosition,
+            loserTargetDrawPosition: loserTargetDrawPosition,
+            byeTargetDrawPosition: byeTargetDrawPosition,
+            winnerMatchUp: winnerMatchUp,
+            loserMatchUp: loserMatchUp,
+            byeMatchUp: byeMatchUp,
         },
         targetMatchUpIds: !!(winnerMatchUpId || loserMatchUpId),
     });
@@ -10641,9 +10641,9 @@ function targetByRoundOutcome(_a) {
 function targetByWinRatio(_a) {
     var matchUp = _a.matchUp;
     return {
-        matchUp: matchUp,
         targetLinks: { loserTargetLink: undefined, winnerTargetLink: undefined },
         targetMatchUps: { loserMatchUp: undefined, winnerMatchUp: undefined },
+        matchUp: matchUp,
     };
 }
 
@@ -44836,6 +44836,30 @@ function generateAndPopulatePlayoffStructures(params) {
         if (result.error)
             console.log(result.error);
     });
+    var byeMatchUps = inContextDrawMatchUps === null || inContextDrawMatchUps === void 0 ? void 0 : inContextDrawMatchUps.filter(function (matchUp) {
+        return matchUp.matchUpStatus === BYE && matchUp.structureId === sourceStructureId;
+    });
+    byeMatchUps === null || byeMatchUps === void 0 ? void 0 : byeMatchUps.forEach(function (matchUp) {
+        var matchUpId = matchUp.matchUpId;
+        var targetData = positionTargets({
+            inContextDrawMatchUps: inContextDrawMatchUps,
+            drawDefinition: drawDefinition,
+            matchUpId: matchUpId,
+        });
+        var loserTargetLink = targetData.targetLinks.loserTargetLink, _a = targetData.targetMatchUps, loserMatchUpDrawPositionIndex = _a.loserMatchUpDrawPositionIndex, // only present when positionTargets found without loserMatchUpId
+        loserMatchUp = _a.loserMatchUp;
+        var targetStructureId = loserTargetLink.target.structureId;
+        var targetDrawPosition = loserMatchUp.drawPositions[loserMatchUpDrawPositionIndex];
+        var result = assignDrawPositionBye$1({
+            drawPosition: targetDrawPosition,
+            structureId: targetStructureId,
+            tournamentRecord: tournamentRecord,
+            drawDefinition: drawDefinition,
+            event: event,
+        });
+        if (result.error)
+            console.log(result.error);
+    });
     // the matchUps in the source structure must have goesTo details added
     var matchUpModifications = [];
     var goesToMap = addGoesTo({
@@ -45424,7 +45448,7 @@ function attachStructures$1(_a) {
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     if (!Array.isArray(structures) || !Array.isArray(links))
-        return { error: INVALID_VALUES };
+        return decorateResult({ result: { error: INVALID_VALUES } });
     var stack = 'attachStructures';
     var linkHash = function (link) {
         var _a;
@@ -48517,12 +48541,22 @@ var DEFAULT_RATING = 0;
 var MAX_ITERATIONS = 5000;
 function generateDrawMaticRound(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
-    var _e = _a.maxIterations, maxIterations = _e === void 0 ? MAX_ITERATIONS : _e, _f = _a.generateMatchUps, generateMatchUps = _f === void 0 ? true : _f, tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, addToStructure = _a.addToStructure, drawDefinition = _a.drawDefinition, adHocRatings = _a.adHocRatings, structureId = _a.structureId, matchUpIds = _a.matchUpIds, eventType = _a.eventType, structure = _a.structure;
+    var _e;
+    var _f = _a.maxIterations, maxIterations = _f === void 0 ? MAX_ITERATIONS : _f, _g = _a.generateMatchUps, generateMatchUps = _g === void 0 ? true : _g, tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, addToStructure = _a.addToStructure, drawDefinition = _a.drawDefinition, adHocRatings = _a.adHocRatings, structureId = _a.structureId, matchUpIds = _a.matchUpIds, eventType = _a.eventType, structure = _a.structure;
+    if (!drawDefinition)
+        return { error: MISSING_DRAW_DEFINITION };
+    if (!structure && !structureId)
+        return { error: STRUCTURE_NOT_FOUND };
+    if (!structure) {
+        structure = findStructure({ drawDefinition: drawDefinition, structureId: structureId }).structure;
+    }
+    if (!isObject(structure))
+        return { error: MISSING_STRUCTURE };
     if (!(participantIds === null || participantIds === void 0 ? void 0 : participantIds.length)) {
         return { error: MISSING_PARTICIPANT_IDS };
     }
     // create valueObject for each previous encounter within the structure
-    var encounters = getEncounters({ matchUps: structure.matchUps }).encounters;
+    var encounters = getEncounters({ matchUps: (_e = structure === null || structure === void 0 ? void 0 : structure.matchUps) !== null && _e !== void 0 ? _e : [] }).encounters;
     // valueObjects provide "weighting" to each possible pairing of participants
     // {
     //  'P-I-0|P-I-1': 1,
@@ -48587,9 +48621,9 @@ function generateDrawMaticRound(_a) {
     //  'P-I-0|P-I-2': 0,
     //  'P-I-0|P-I-3': 0
     // }
-    var _g = getPairingsData({
+    var _h = getPairingsData({
         participantIds: participantIds,
-    }), uniquePairings = _g.uniquePairings, possiblePairings = _g.possiblePairings, deltaObjects = _g.deltaObjects;
+    }), uniquePairings = _h.uniquePairings, possiblePairings = _h.possiblePairings, deltaObjects = _h.deltaObjects;
     var params = {
         tournamentParticipants: tournamentParticipants,
         possiblePairings: possiblePairings,
@@ -48603,18 +48637,18 @@ function generateDrawMaticRound(_a) {
         eventType: eventType,
         structure: structure,
     };
-    var _h = getPairings(params), candidatesCount = _h.candidatesCount, participantIdPairings = _h.participantIdPairings, iterations = _h.iterations;
+    var _j = getPairings(params), candidatesCount = _j.candidatesCount, participantIdPairings = _j.participantIdPairings, iterations = _j.iterations;
     if (!candidatesCount)
         return { error: NO_CANDIDATES };
     var matchUps;
     if (generateMatchUps) {
         var result = generateAdHocMatchUps$1({
+            structureId: structure === null || structure === void 0 ? void 0 : structure.structureId,
             participantIdPairings: participantIdPairings,
             tournamentRecord: tournamentRecord,
             addToStructure: addToStructure,
             newRound: true,
             drawDefinition: drawDefinition,
-            structureId: structureId,
             matchUpIds: matchUpIds,
         });
         if (result.error)
@@ -48759,8 +48793,8 @@ function getParticipantPairingValues(_a) {
 
 function drawMatic$1(_a) {
     var e_1, _b;
-    var _c, _d, _e, _f;
-    var tournamentParticipants = _a.tournamentParticipants, restrictEntryStatus = _a.restrictEntryStatus, tournamentRecord = _a.tournamentRecord, generateMatchUps = _a.generateMatchUps, addToStructure = _a.addToStructure, participantIds = _a.participantIds, drawDefinition = _a.drawDefinition, maxIterations = _a.maxIterations, structureId = _a.structureId, matchUpIds = _a.matchUpIds, scaleName = _a.scaleName, // custom rating name to seed dynamic ratings
+    var _c, _d, _e, _f, _g;
+    var tournamentParticipants = _a.tournamentParticipants, restrictEntryStatus = _a.restrictEntryStatus, tournamentRecord = _a.tournamentRecord, generateMatchUps = _a.generateMatchUps, addToStructure = _a.addToStructure, participantIds = _a.participantIds, drawDefinition = _a.drawDefinition, scaleAccessor = _a.scaleAccessor, maxIterations = _a.maxIterations, structureId = _a.structureId, matchUpIds = _a.matchUpIds, scaleName = _a.scaleName, // custom rating name to seed dynamic ratings
     eventType = _a.eventType, event = _a.event;
     if (typeof drawDefinition !== 'object' ||
         (drawDefinition.drawType && drawDefinition.drawType !== AD_HOC)) {
@@ -48808,6 +48842,8 @@ function drawMatic$1(_a) {
     var structureIsAdHoc = isAdHoc({ drawDefinition: drawDefinition, structure: structure });
     if (!structureIsAdHoc)
         return { error: INVALID_DRAW_DEFINITION };
+    tournamentParticipants =
+        (_g = tournamentParticipants !== null && tournamentParticipants !== void 0 ? tournamentParticipants : tournamentRecord.participants) !== null && _g !== void 0 ? _g : [];
     var adHocRatings = {};
     var _loop_1 = function (participantId) {
         var participant = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.find(function (participant) { return participant.participantId === participantId; });
@@ -48815,24 +48851,31 @@ function drawMatic$1(_a) {
         var scaleValue = getScaleValue({ eventType: eventType, participant: participant });
         // if no dynamic value found and a seeding scaleValue is provided...
         if (!scaleValue && scaleName) {
-            scaleValue = getScaleValue({ scaleName: scaleName, eventType: eventType, participant: participant });
+            scaleValue = getScaleValue({
+                scaleAccessor: scaleAccessor,
+                participant: participant,
+                scaleName: scaleName,
+                eventType: eventType,
+            });
         }
         if (scaleValue)
             adHocRatings[participantId] = scaleValue;
     };
     try {
-        for (var _g = __values(participantIds !== null && participantIds !== void 0 ? participantIds : []), _h = _g.next(); !_h.done; _h = _g.next()) {
-            var participantId = _h.value;
+        for (var _h = __values(participantIds !== null && participantIds !== void 0 ? participantIds : []), _j = _h.next(); !_j.done; _j = _h.next()) {
+            var participantId = _j.value;
             _loop_1(participantId);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+            if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
         }
         finally { if (e_1) throw e_1.error; }
     }
+    // TODO: update dynamic ratings based on matchUps present from last played round
+    // use scaleEngine.processMatchUps(); see dynamicCalculations.test.ts
     return generateDrawMaticRound({
         tournamentParticipants: tournamentParticipants,
         tournamentRecord: tournamentRecord,
@@ -48842,7 +48885,6 @@ function drawMatic$1(_a) {
         drawDefinition: drawDefinition,
         maxIterations: maxIterations,
         adHocRatings: adHocRatings,
-        structureId: structureId,
         matchUpIds: matchUpIds,
         structure: structure,
         eventType: eventType,
@@ -48850,7 +48892,7 @@ function drawMatic$1(_a) {
 }
 function getScaleValue(_a) {
     var _b;
-    var _c = _a.scaleName, scaleName = _c === void 0 ? 'dynamic' : _c, eventType = _a.eventType, participant = _a.participant;
+    var _c = _a.eventType, eventType = _c === void 0 ? TypeEnum.Singles : _c, _d = _a.scaleName, scaleName = _d === void 0 ? 'dynamic' : _d, scaleAccessor = _a.scaleAccessor, participant = _a.participant;
     var scaleAttributes = {
         eventType: eventType || TypeEnum.Singles,
         scaleType: RATING$2,
@@ -48861,7 +48903,10 @@ function getScaleValue(_a) {
             scaleAttributes: scaleAttributes,
             participant: participant,
         });
-    return (_b = result === null || result === void 0 ? void 0 : result.scaleItem) === null || _b === void 0 ? void 0 : _b.scaleValue;
+    var scaleValue = (_b = result === null || result === void 0 ? void 0 : result.scaleItem) === null || _b === void 0 ? void 0 : _b.scaleValue;
+    return scaleAccessor && isObject(scaleValue)
+        ? scaleValue[scaleAccessor]
+        : scaleValue;
 }
 
 function setDelegatedOutcome$1(_a) {
@@ -60528,7 +60573,7 @@ function getScaledEntries(_a) {
         .filter(function (scaledEntry) {
         var scaleValue = scaledEntry.scaleValue;
         // if a custom sort method is not provided, filter out entries with non-float values
-        if (!scaleSortMethod && scaleValue && typeof scaleValue !== 'number')
+        if (!scaleSortMethod && (isNaN(scaleValue) || !parseFloat(scaleValue)))
             return false;
         return scaleValue;
     })
@@ -62368,13 +62413,21 @@ function generateDrawDefinition(params) {
             var participantIds_1 = entries_2 === null || entries_2 === void 0 ? void 0 : entries_2.map(extractAttributes('participantId'));
             var matchUpsCount_1 = entries_2 ? Math.floor(entries_2.length / 2) : 0;
             generateRange(1, params.roundsCount + 1).forEach(function () {
+                var _a, _b, _c;
                 if (params.automated) {
+                    var _d = (_a = params.drawMatic) !== null && _a !== void 0 ? _a : {}, restrictEntryStatus = _d.restrictEntryStatus, generateMatchUps = _d.generateMatchUps, addToStructure = _d.addToStructure, maxIterations = _d.maxIterations, structureId_1 = _d.structureId, matchUpIds = _d.matchUpIds, scaleName = _d.scaleName;
                     drawMatic$1({
-                        generateMatchUps: true,
-                        eventType: matchUpType,
                         tournamentRecord: tournamentRecord,
                         participantIds: participantIds_1,
                         drawDefinition: drawDefinition,
+                        eventType: (_c = (_b = params.drawMatic) === null || _b === void 0 ? void 0 : _b.eventType) !== null && _c !== void 0 ? _c : matchUpType,
+                        generateMatchUps: generateMatchUps !== null && generateMatchUps !== void 0 ? generateMatchUps : true,
+                        restrictEntryStatus: restrictEntryStatus,
+                        addToStructure: addToStructure,
+                        maxIterations: maxIterations,
+                        structureId: structureId_1,
+                        matchUpIds: matchUpIds,
+                        scaleName: scaleName,
                     });
                 }
                 else {
@@ -62763,9 +62816,10 @@ var eventGovernor = {
     checkOutParticipant: checkOutParticipant,
     toggleParticipantCheckInState: toggleParticipantCheckInState$1,
     addDrawDefinitionTimeItem: addDrawDefinitionTimeItem,
-    generateDrawDefinition: generateDrawDefinition,
-    generateDrawStructuresAndLinks: generateDrawStructuresAndLinks,
     generateDrawTypeAndModifyDrawDefinition: generateDrawTypeAndModifyDrawDefinition,
+    generateDrawStructuresAndLinks: generateDrawStructuresAndLinks,
+    generateDrawMaticRound: generateDrawMaticRound,
+    generateDrawDefinition: generateDrawDefinition,
     applyLineUps: applyLineUps,
     assignTieMatchUpParticipantId: assignTieMatchUpParticipantId,
     removeTieMatchUpParticipantId: removeTieMatchUpParticipantId,