tods-competition-factory 1.8.10 → 1.8.11

package/dist/forge/generate.mjs

@@ -18162,7 +18162,7 @@ function addStructureParticipation({
 
 function processSides(params) {
   const {
-    withScheduleTimes,
+    withScheduleItems,
     scheduleAnalysis,
     withTeamMatchUps,
     participantMap,
@@ -18272,7 +18272,7 @@ function processSides(params) {
           stage
         });
       }
-      if (scheduleAnalysis || withScheduleTimes) {
+      if (scheduleAnalysis || withScheduleItems) {
         addScheduleItem({
           participantMap,
           participantId: participantId2,
@@ -18418,6 +18418,7 @@ function getParticipantEntries(params) {
     participantMap,
     withPotentialMatchUps,
     withRankingProfile,
+    withScheduleItems,
     scheduleAnalysis,
     withTeamMatchUps,
     withStatistics,
@@ -18427,7 +18428,6 @@ function getParticipantEntries(params) {
     withEvents,
     withDraws
   } = params;
-  const withScheduleTimes = params.withScheduleTimes ?? params.withScheduleItems;
   const targetParticipantIds = participantFilters?.participantIds;
   const getRelevantParticipantIds = (participantId) => {
     const relevantParticipantIds = [participantId];
@@ -18445,7 +18445,7 @@ function getParticipantEntries(params) {
     withDraws: withDraws || withRankingProfile,
     withPotentialMatchUps,
     withRankingProfile,
-    withScheduleTimes,
+    withScheduleItems,
     scheduleAnalysis,
     withTeamMatchUps,
     withStatistics,
@@ -18765,7 +18765,7 @@ function getParticipantEntries(params) {
             matchUpType: matchUpType2
           });
         }
-        if (Array.isArray(potentialParticipants) && (nextMatchUps || !!scheduleAnalysis || withScheduleTimes)) {
+        if (Array.isArray(potentialParticipants) && (nextMatchUps || !!scheduleAnalysis || withScheduleItems)) {
           const potentialParticipantIds = potentialParticipants.flat().map(extractAttributes("participantId")).filter(Boolean);
           potentialParticipantIds?.forEach((participantId) => {
             const relevantParticipantIds = getRelevantParticipantIds(participantId);
@@ -18780,7 +18780,7 @@ function getParticipantEntries(params) {
                 drawId
               });
             });
-            if (!!scheduleAnalysis || withScheduleTimes) {
+            if (!!scheduleAnalysis || withScheduleItems) {
               addScheduleItem({
                 potential: true,
                 participantMap,
@@ -18889,13 +18889,18 @@ function getParticipantEntries(params) {
             const notBeforeTime = typeChange ? typeChangeTimeAfterRecovery || timeAfterRecovery : timeAfterRecovery;
             const sameDraw = scheduleItem.drawId === consideredItem.drawId;
             const bothPotential = potentialMatchUps[scheduleItem.matchUpId] && potentialMatchUps[consideredItem.matchUpId];
-            const nextMinutes = timeStringMinutes(consideredItem.scheduledTime);
-            const minutesDifference = Math.abs(nextMinutes - scheduledMinutes);
-            const timeOverlap = scheduledMinutesDifference && !isNaN(scheduledMinutesDifference) ? minutesDifference <= scheduledMinutesDifference : timeStringMinutes(notBeforeTime) > timeStringMinutes(consideredItem.scheduledTime);
-            if (timeOverlap && !(bothPotential && sameDraw)) {
+            const consideredMinutes = timeStringMinutes(
+              consideredItem.scheduledTime
+            );
+            const minutesDifference = Math.abs(
+              consideredMinutes - scheduledMinutes
+            );
+            const itemIsPrior = consideredMinutes > scheduledMinutes;
+            const timeOverlap = scheduledMinutesDifference && !isNaN(scheduledMinutesDifference) ? minutesDifference <= scheduledMinutesDifference : itemIsPrior && timeStringMinutes(consideredItem.scheduledTime) < timeStringMinutes(notBeforeTime);
+            if (timeOverlap && !(bothPotential && sameDraw) && itemIsPrior) {
               participantAggregator.scheduleConflicts.push({
-                priorScheduledMatchUpId: consideredItem.matchUpId,
-                matchUpIdWithConflict: scheduleItem.matchUpId
+                priorScheduledMatchUpId: scheduleItem.matchUpId,
+                matchUpIdWithConflict: consideredItem.matchUpId
               });
             }
           }
@@ -19111,6 +19116,7 @@ function getParticipants(params) {
     ({
       potentialMatchUps,
       scheduleConflicts,
+      scheduleItems,
       participant,
       statistics,
       opponents,
@@ -19136,7 +19142,8 @@ function getParticipants(params) {
           matchUps: withMatchUps || withRankingProfile ? Object.values(matchUps2) : void 0,
           opponents: withOpponents ? participantOpponents : void 0,
           potentialMatchUps: nextMatchUps ? Object.values(potentialMatchUps) : void 0,
-          statistics: withStatistics ? Object.values(statistics) : void 0
+          statistics: withStatistics ? Object.values(statistics) : void 0,
+          scheduleItems: withScheduleItems ? scheduleItems : void 0
         },
         false,
         false,
@@ -23639,7 +23646,7 @@ function generateDrawDefinition(params) {
       drawDefinition.links = [];
     drawDefinition.links.push(link);
   }
-  drawDefinition.drawName = params.drawName ?? drawType;
+  drawDefinition.drawName = params.drawName ?? (drawType && constantToString(drawType));
   if (typeof voluntaryConsolation === "object") {
     addVoluntaryConsolationStructure({
       ...voluntaryConsolation,