tods-competition-factory 1.8.46 → 1.9.0

package/dist/forge/generate.mjs

@@ -1214,7 +1214,7 @@ function isString(obj) {
   return typeof obj === "string";
 }
 function isObject(obj) {
-  return typeof obj === "object";
+  return obj !== null && typeof obj === "object";
 }
 const extractAttributes = (accessor) => (element) => !accessor || typeof element !== "object" ? void 0 : Array.isArray(accessor) && accessor.map((a) => ({
   [a]: getAccessorValue({ element, accessor: a })?.value
@@ -2214,6 +2214,7 @@ const RESUME_TIME = "SCHEDULE.TIME.RESUME";
 const END_TIME = "SCHEDULE.TIME.END";
 const TIME_MODIFIERS = "SCHEDULE.TIME.MODIFIERS";
 const PUBLISH = "PUBLISH";
+const PUBLIC = "PUBLIC";
 const STATUS = "STATUS";
 
 function getTimeStamp(item) {
@@ -2436,8 +2437,10 @@ function getMatchUpScheduleDetails({
   scheduleVisibilityFilters,
   afterRecoveryTimes,
   tournamentRecord,
+  usePublishState,
   scheduleTiming,
   matchUpFormat,
+  publishStatus,
   matchUpType,
   matchUp,
   event
@@ -2554,15 +2557,36 @@ function getMatchUpScheduleDetails({
     });
   } else {
     schedule = definedAttributes({
-      time,
+      milliseconds,
       startTime,
       endTime,
-      milliseconds
+      time
     });
   }
-  const hasCompletedStatus = matchUp.matchUpStatus && completedMatchUpStatuses.includes(matchUp.matchUpStatus);
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const { scheduledTime } = scheduledMatchUpTime({ matchUp });
+  if (usePublishState && publishStatus?.displaySettings?.draws) {
+    const drawSettings = publishStatus.displaySettings.draws;
+    const scheduleDetails = (drawSettings?.[matchUp.drawId] ?? drawSettings?.default)?.scheduleDetails;
+    if (scheduleDetails) {
+      const scheduleAttributes = (scheduleDetails.find(
+        (details) => scheduledDate && details.dates?.includes(scheduledDate)
+      ) ?? scheduleDetails.find((details) => !details.dates?.length))?.attributes;
+      if (scheduleAttributes) {
+        const template = Object.assign(
+          {},
+          ...Object.keys(schedule).map((key) => ({ [key]: true })),
+          // overwrite with publishStatus attributes
+          scheduleAttributes
+        );
+        schedule = attributeFilter({
+          source: schedule,
+          template
+        });
+      }
+    }
+  }
+  const hasCompletedStatus = matchUp.matchUpStatus && completedMatchUpStatuses.includes(matchUp.matchUpStatus);
   const endDate = hasCompletedStatus && (extractDate(endTime) || extractDate(scheduledDate) || extractDate(scheduledTime)) || void 0;
   return { schedule, endDate };
 }
@@ -4505,6 +4529,7 @@ function getAllStructureMatchUps({
   policyDefinitions,
   tournamentRecord,
   seedAssignments,
+  usePublishState,
   contextFilters,
   contextContent,
   matchUpFilters,
@@ -4512,6 +4537,7 @@ function getAllStructureMatchUps({
   scheduleTiming,
   contextProfile,
   drawDefinition,
+  publishStatus,
   context = {},
   exitProfiles,
   matchUpsMap,
@@ -4620,6 +4646,8 @@ function getAllStructureMatchUps({
         roundNamingProfile,
         initialRoundOfPlay,
         appliedPolicies,
+        usePublishState,
+        publishStatus,
         isRoundRobin,
         roundProfile,
         matchUp,
@@ -4689,6 +4717,8 @@ function getAllStructureMatchUps({
     tieDrawPositions,
     appliedPolicies: appliedPolicies2,
     isCollectionBye,
+    usePublishState: usePublishState2,
+    publishStatus: publishStatus2,
     matchUpTieId,
     isRoundRobin: isRoundRobin2,
     roundProfile: roundProfile2,
@@ -4714,8 +4744,10 @@ function getAllStructureMatchUps({
       scheduleVisibilityFilters: scheduleVisibilityFilters2,
       afterRecoveryTimes,
       tournamentRecord,
+      usePublishState: usePublishState2,
       scheduleTiming,
       matchUpFormat,
+      publishStatus: publishStatus2,
       matchUpType,
       matchUp,
       event: event2
@@ -4838,7 +4870,7 @@ function getAllStructureMatchUps({
       Object.assign(matchUpWithContext, makeDeepCopy({ sides }, true, true));
     }
     if (tournamentParticipants && matchUpWithContext.sides) {
-      const participantAttributes = policyDefinitions?.[POLICY_TYPE_PARTICIPANT];
+      const participantAttributes = appliedPolicies2?.[POLICY_TYPE_PARTICIPANT];
       const getMappedParticipant = (participantId) => {
         const participant = participantMap?.[participantId]?.participant;
         return participant && attributeFilter({
@@ -4954,6 +4986,8 @@ function getAllStructureMatchUps({
             additionalContext: additionalContext2,
             appliedPolicies: appliedPolicies2,
             isCollectionBye: isCollectionBye2,
+            usePublishState: usePublishState2,
+            publishStatus: publishStatus2,
             matchUpTieId: matchUpTieId2,
             isRoundRobin: isRoundRobin2,
             roundProfile: roundProfile2,
@@ -5866,6 +5900,64 @@ function getSeedPattern(seedingProfile) {
     return seedingProfile.positioning;
 }
 
+function getTimeItem({
+  returnPreviousValues,
+  itemSubTypes,
+  itemType,
+  element
+}) {
+  if (!element)
+    return { error: MISSING_VALUE, info: ELEMENT_REQUIRED };
+  if (itemSubTypes && !Array.isArray(itemSubTypes))
+    return { error: INVALID_VALUES, context: { itemSubTypes } };
+  if (!Array.isArray(element.timeItems))
+    return { error: MISSING_TIME_ITEMS };
+  const filteredSorted = element.timeItems.filter((timeItem2) => timeItem2?.itemType === itemType).filter(
+    (timeItem2) => !itemSubTypes?.length || itemSubTypes.some(
+      (subType) => timeItem2?.itemSubTypes?.includes(subType)
+    )
+  ).sort((a, b) => {
+    const aDate = new Date(a.createdAt || void 0).getTime();
+    const bDate = new Date(b.createdAt || void 0).getTime();
+    return aDate - bDate;
+  });
+  const timeItem = filteredSorted.pop();
+  if (timeItem) {
+    const result = { timeItem, ...SUCCESS };
+    if (returnPreviousValues)
+      Object.assign(result, { previousItems: filteredSorted });
+    return result;
+  } else {
+    return { info: NOT_FOUND };
+  }
+}
+function getEventTimeItem({
+  returnPreviousValues,
+  itemSubTypes,
+  itemType,
+  event
+}) {
+  if (!event)
+    return { error: MISSING_EVENT };
+  if (!event.timeItems)
+    return { info: NOT_FOUND };
+  const { timeItem, previousItems, info } = getTimeItem({
+    returnPreviousValues,
+    element: event,
+    itemSubTypes,
+    itemType
+  });
+  return timeItem && { timeItem, previousItems } || { info };
+}
+
+function getEventPublishStatus({ event, status = PUBLIC }) {
+  const itemType = `${PUBLISH}.${STATUS}`;
+  return getEventTimeItem({
+    itemType,
+    event
+  })?.timeItem?.itemValue?.[status];
+}
+
 function addParticipantGroupings({
   participantsProfile,
   participants = [],
@@ -7724,38 +7816,6 @@ function addIndividualParticipants({ participantMap, template }) {
   }
 }
 
-function getTimeItem({
-  returnPreviousValues,
-  itemSubTypes,
-  itemType,
-  element
-}) {
-  if (!element)
-    return { error: MISSING_VALUE, info: ELEMENT_REQUIRED };
-  if (itemSubTypes && !Array.isArray(itemSubTypes))
-    return { error: INVALID_VALUES, context: { itemSubTypes } };
-  if (!Array.isArray(element.timeItems))
-    return { error: MISSING_TIME_ITEMS };
-  const filteredSorted = element.timeItems.filter((timeItem2) => timeItem2?.itemType === itemType).filter(
-    (timeItem2) => !itemSubTypes?.length || itemSubTypes.some(
-      (subType) => timeItem2?.itemSubTypes?.includes(subType)
-    )
-  ).sort((a, b) => {
-    const aDate = new Date(a.createdAt || void 0).getTime();
-    const bDate = new Date(b.createdAt || void 0).getTime();
-    return aDate - bDate;
-  });
-  const timeItem = filteredSorted.pop();
-  if (timeItem) {
-    const result = { timeItem, ...SUCCESS };
-    if (returnPreviousValues)
-      Object.assign(result, { previousItems: filteredSorted });
-    return result;
-  } else {
-    return { info: NOT_FOUND };
-  }
-}
-
 const typeMap = {
   [GROUP]: "groupParticipantIds",
   [PAIR]: "pairParticipantIds",
@@ -8483,11 +8543,13 @@ function getStructureMatchUps({
   afterRecoveryTimes,
   policyDefinitions,
   tournamentRecord,
+  usePublishState,
   matchUpFilters,
   contextFilters,
   contextContent,
   participantMap,
   scheduleTiming,
+  publishStatus,
   contextProfile,
   drawDefinition,
   exitProfiles,
@@ -8508,13 +8570,15 @@ function getStructureMatchUps({
     afterRecoveryTimes,
     policyDefinitions,
     tournamentRecord,
-    drawDefinition,
+    usePublishState,
     matchUpFilters,
     contextFilters,
-    contextProfile,
     contextContent,
     participantMap,
     scheduleTiming,
+    publishStatus,
+    contextProfile,
+    drawDefinition,
     exitProfiles,
     matchUpsMap,
     structure,
@@ -8610,12 +8674,14 @@ function getDrawMatchUps(params) {
     afterRecoveryTimes,
     policyDefinitions,
     tournamentRecord,
+    usePublishState,
     contextFilters,
-    contextProfile,
-    drawDefinition,
     matchUpFilters,
     scheduleTiming,
     participantMap,
+    publishStatus,
+    contextProfile,
+    drawDefinition,
     nextMatchUps,
     inContext,
     context,
@@ -8670,9 +8736,11 @@ function getDrawMatchUps(params) {
       afterRecoveryTimes,
       policyDefinitions,
       tournamentRecord,
+      usePublishState,
+      contextContent,
       participantMap,
       scheduleTiming,
-      contextContent,
+      publishStatus,
       contextProfile,
       drawDefinition,
       exitProfiles,
@@ -16496,8 +16564,7 @@ function tieFormatGenderValidityCheck(params) {
       context: { gender },
       stack
     });
-  const eventType = params.eventType ?? params.referenceEvent?.eventType;
-  if (referenceGender === MIXED && (eventType !== TEAM$2 || gender === ANY || gender === MIXED && matchUpType !== TypeEnum.Doubles)) {
+  if (referenceGender === MIXED && (gender === ANY || gender === MIXED && matchUpType !== TypeEnum.Doubles)) {
     return decorateResult({
       result: { error: INVALID_GENDER, valid: false },
       info: mixedGenderError,
@@ -16888,7 +16955,6 @@ function validateTieFormat(params) {
       const { valid: valid2, errors: collectionDefinitionErrors } = validateCollectionDefinition({
         referenceCategory: params.category,
         referenceGender: params.gender,
-        eventType: params.eventType,
         collectionDefinition,
         checkCollectionIds,
         checkCategory,
@@ -16940,7 +17006,6 @@ function validateCollectionDefinition({
   checkGender = true,
   referenceCategory,
   referenceGender,
-  eventType,
   event
 }) {
   referenceGender = referenceGender ?? event?.gender;
@@ -17008,7 +17073,6 @@ function validateCollectionDefinition({
   }
   if (checkGender) {
     const result = tieFormatGenderValidityCheck({
-      eventType: eventType ?? event?.eventType,
       referenceGender,
       matchUpType,
       gender
@@ -17041,12 +17105,10 @@ function validateCollectionDefinition({
   return { valid: true };
 }
 function checkTieFormat({
-  tieFormat,
-  eventType
+  tieFormat
 }) {
   const result = validateTieFormat({
     checkCollectionIds: false,
-    eventType,
     tieFormat
   });
   if (result.error)
@@ -17273,7 +17335,7 @@ function generateTieMatchUpScore(params) {
   const tieFormat = resolveTieFormat({ matchUp, drawDefinition, structure, event })?.tieFormat || params?.tieFormat;
   if (!tieFormat)
     return { error: MISSING_TIE_FORMAT };
-  const result = validateTieFormat({ tieFormat, eventType: event?.eventType });
+  const result = validateTieFormat({ tieFormat });
   if (result.error)
     return result;
   const collectionDefinitions = tieFormat?.collectionDefinitions || [];
@@ -18246,14 +18308,14 @@ function generateAndPopulatePlayoffStructures(params) {
   };
 }
 
+function getDrawPublishStatus({ drawDetails, drawId }) {
+  const details = drawDetails?.[drawId]?.publishingDetail;
+  return details?.published;
+}
+
 function getEventPublishStatuses({ event }) {
-  const itemType = `${PUBLISH}.${STATUS}`;
-  const { timeItem } = getTimeItem({
-    element: event,
-    itemType
-  });
-  if (timeItem?.itemValue?.PUBLIC) {
-    const { drawIds: publishedDrawIds = [], seeding } = timeItem.itemValue.PUBLIC || {};
+  const eventPubStatus = getEventPublishStatus({ event });
+  if (eventPubStatus) {
     const publishedSeeding = {
       published: void 0,
       // seeding can be present for all entries in an event when no flights have been defined
@@ -18261,9 +18323,13 @@ function getEventPublishStatuses({ event }) {
       drawIds: []
       // seeding can be specific to drawIds
     };
-    if (seeding) {
-      Object.assign(publishedSeeding, timeItem.itemValue.PUBLIC.seeding);
+    if (eventPubStatus.seeding) {
+      Object.assign(publishedSeeding, eventPubStatus.seeding);
     }
+    const { drawDetails, drawIds } = eventPubStatus;
+    const publishedDrawIds = drawDetails && Object.keys(drawDetails).filter(
+      (drawId) => getDrawPublishStatus({ drawDetails, drawId })
+    ) || drawIds || [];
     return {
       publishedDrawIds,
       publishedSeeding
@@ -18386,6 +18452,10 @@ function getEventSeedAssignments({
   return eventSeedAssignments;
 }
 
+function stringSort(a, b) {
+  return (a || "").localeCompare(b || "");
+}
+
 function processEventEntry({
   convertExtensions,
   seedAssignments,
@@ -19257,7 +19327,7 @@ function getParticipantEntries(params) {
             const itemIsPrior = consideredMinutes >= scheduledMinutes;
             const timeOverlap = scheduledMinutesDifference && !isNaN(scheduledMinutesDifference) ? minutesDifference <= scheduledMinutesDifference : itemIsPrior && timeStringMinutes(consideredItem.scheduledTime) < timeStringMinutes(notBeforeTime);
             if (timeOverlap && !(bothPotential && sameDraw) && itemIsPrior) {
-              const key = [scheduleItem.matchUpId, consideredItem.matchUpId].sort().join("|");
+              const key = [scheduleItem.matchUpId, consideredItem.matchUpId].sort(stringSort).join("|");
               participantAggregator.scheduleConflicts[key] = {
                 priorScheduledMatchUpId: scheduleItem.matchUpId,
                 matchUpIdWithConflict: consideredItem.matchUpId
@@ -20155,8 +20225,7 @@ function generateVoluntaryConsolation$1(params) {
     return { error: INVALID_DRAW_SIZE };
   let { tieFormat, matchUpType } = params;
   if (tieFormat) {
-    const eventType = params.event?.eventType;
-    const result2 = validateTieFormat({ tieFormat, eventType });
+    const result2 = validateTieFormat({ tieFormat });
     if (result2.error)
       return result2;
   }
@@ -20392,10 +20461,6 @@ function addAdHocMatchUps({
   return { ...SUCCESS };
 }
 
-function stringSort(a, b) {
-  return (a || "").localeCompare(b || "");
-}
-
 function generateCandidate({
   maxIterations = 4e3,
   // cap the processing intensity of the candidate generator
@@ -21258,8 +21323,7 @@ function generateDrawTypeAndModifyDrawDefinition(params) {
   const drawDefinition = modifyOriginal ? params.drawDefinition : makeDeepCopy(params.drawDefinition, false, true);
   let { tieFormat, matchUpType } = params;
   if (tieFormat) {
-    const eventType = params.event?.eventType;
-    const result2 = validateTieFormat({ tieFormat, eventType });
+    const result2 = validateTieFormat({ tieFormat });
     if (result2.error)
       return result2;
   }
@@ -23744,8 +23808,7 @@ function generateDrawDefinition(params) {
     const result = validateTieFormat({
       gender: event?.gender,
       enforceGender,
-      tieFormat,
-      event
+      tieFormat
     });
     if (result.error)
       return decorateResult({ result, stack });
@@ -23764,10 +23827,7 @@ function generateDrawDefinition(params) {
     const equivalentInScope = matchUpFormat && event?.matchUpFormat === matchUpFormat || event?.tieFormat && tieFormat && JSON.stringify(event.tieFormat) === JSON.stringify(tieFormat);
     if (!equivalentInScope) {
       if (tieFormat) {
-        const result = checkTieFormat({
-          eventType: event.eventType,
-          tieFormat
-        });
+        const result = checkTieFormat({ tieFormat });
         if (result.error)
           return decorateResult({ result, stack });
         drawDefinition.tieFormat = result.tieFormat ?? tieFormat;
@@ -24098,7 +24158,7 @@ function generateDrawDefinition(params) {
     drawDefinition.links.push(link);
   }
   drawDefinition.drawName = params.drawName ?? (drawType && constantToString(drawType));
-  if (typeof voluntaryConsolation === "object") {
+  if (typeof voluntaryConsolation === "object" && drawSize >= 4) {
     addVoluntaryConsolationStructure({
       ...voluntaryConsolation,
       tournamentRecord,