tods-competition-factory 1.8.46 → 1.9.1

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

@@ -2351,7 +2351,33 @@ function isString(obj) {
     return typeof obj === 'string';
 }
 function isObject(obj) {
-    return typeof obj === 'object';
+    return obj !== null && typeof obj === 'object';
+}
+function objShallowEqual(o1, o2) {
+    var e_1, _a;
+    if (!isObject(o1) || !isObject(o2))
+        return false;
+    var keys1 = Object.keys(o1);
+    var keys2 = Object.keys(o2);
+    if (keys1.length !== keys2.length) {
+        return false;
+    }
+    try {
+        for (var keys1_1 = __values(keys1), keys1_1_1 = keys1_1.next(); !keys1_1_1.done; keys1_1_1 = keys1_1.next()) {
+            var key = keys1_1_1.value;
+            if (o1[key] !== o2[key]) {
+                return false;
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (keys1_1_1 && !keys1_1_1.done && (_a = keys1_1.return)) _a.call(keys1_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return true;
 }
 function createMap(objectArray, attribute) {
     if (!Array.isArray(objectArray))
@@ -2395,6 +2421,12 @@ var extractAttributes = function (accessor) { return function (element) {
                 })) ||
             ((_a = (typeof accessor === 'string' && getAccessorValue({ element: element, accessor: accessor }))) === null || _a === void 0 ? void 0 : _a.value);
 }; };
+function getDefinedKeys(obj, ignoreValues, ignoreEmptyArrays) {
+    return Object.keys(obj).filter(function (key) {
+        return !ignoreValues.includes(obj[key]) &&
+            (!ignoreEmptyArrays || (Array.isArray(obj[key]) ? obj[key].length : true));
+    });
+}
 function definedAttributes(obj, ignoreFalse, ignoreEmptyArrays, shallow) {
     if (typeof obj !== 'object' || obj === null)
         return obj;
@@ -2404,10 +2436,7 @@ function definedAttributes(obj, ignoreFalse, ignoreEmptyArrays, shallow) {
     var ignoreValues = ['', undefined, null];
     if (ignoreFalse)
         ignoreValues.push(false);
-    var definedKeys = Object.keys(obj).filter(function (key) {
-        return !ignoreValues.includes(obj[key]) &&
-            (!ignoreEmptyArrays || (Array.isArray(obj[key]) ? obj[key].length : true));
-    });
+    var definedKeys = getDefinedKeys(obj, ignoreValues, ignoreEmptyArrays);
     return Object.assign.apply(Object, __spreadArray([{}], __read(definedKeys.map(function (key) {
         var _a, _b;
         return Array.isArray(obj[key])
@@ -2929,7 +2958,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.8.46';
+    return '1.9.1';
 }
 
 function getObjectTieFormat(obj) {
@@ -3010,34 +3039,6 @@ function decorateResult(_a) {
     return result !== null && result !== void 0 ? result : { success: true };
 }
 
-var ANY = 'ANY';
-var MALE = 'MALE';
-var MIXED = 'MIXED';
-var OTHER$3 = 'OTHER';
-var FEMALE = 'FEMALE';
-var genderConstants = {
-    ANY: ANY,
-    MALE: MALE,
-    FEMALE: FEMALE,
-    MIXED: MIXED,
-    OTHER: OTHER$3,
-};
-
-var SINGLES_MATCHUP = 'SINGLES';
-var SINGLES$1 = 'SINGLES';
-var DOUBLES_MATCHUP = 'DOUBLES';
-var DOUBLES$1 = 'DOUBLES';
-var TEAM_MATCHUP = 'TEAM';
-var TEAM$2 = 'TEAM';
-var matchUpTypes = {
-    SINGLES_MATCHUP: SINGLES_MATCHUP,
-    SINGLES: SINGLES$1,
-    DOUBLES_MATCHUP: DOUBLES_MATCHUP,
-    DOUBLES: DOUBLES$1,
-    TEAM_MATCHUP: TEAM_MATCHUP,
-    TEAM: TEAM$2,
-};
-
 var DrawTypeEnum;
 (function (DrawTypeEnum) {
     DrawTypeEnum["AdHoc"] = "AD_HOC";
@@ -3598,10 +3599,22 @@ var SexEnum;
     SexEnum["Other"] = "OTHER";
 })(SexEnum || (SexEnum = {}));
 
+var ANY = 'ANY';
+var MALE = 'MALE';
+var MIXED = 'MIXED';
+var OTHER$3 = 'OTHER';
+var FEMALE = 'FEMALE';
+var genderConstants = {
+    ANY: ANY,
+    MALE: MALE,
+    FEMALE: FEMALE,
+    MIXED: MIXED,
+    OTHER: OTHER$3,
+};
+
 var mixedGenderError = 'MIXED events can not contain mixed singles or { gender: ANY } collections';
 var anyMixedError = 'events with { gender: ANY } can not contain MIXED singles collections';
 function tieFormatGenderValidityCheck(params) {
-    var _a, _b;
     var stack = 'tieFormatGenderValidityCheck';
     var referenceGender = params.referenceGender, matchUpType = params.matchUpType, gender = params.gender;
     if (referenceGender &&
@@ -3613,11 +3626,8 @@ function tieFormatGenderValidityCheck(params) {
             context: { gender: gender },
             stack: stack,
         });
-    var eventType = (_a = params.eventType) !== null && _a !== void 0 ? _a : (_b = params.referenceEvent) === null || _b === void 0 ? void 0 : _b.eventType;
     if (referenceGender === MIXED &&
-        (eventType !== TEAM$2 ||
-            gender === ANY ||
-            (gender === MIXED && matchUpType !== TypeEnum.Doubles))) {
+        (gender === ANY || (gender === MIXED && matchUpType !== TypeEnum.Doubles))) {
         return decorateResult({
             result: { error: INVALID_GENDER, valid: false },
             info: mixedGenderError,
@@ -3963,7 +3973,6 @@ function validateTieFormat(params) {
         var _a = validateCollectionDefinition({
             referenceCategory: params.category,
             referenceGender: params.gender,
-            eventType: params.eventType,
             collectionDefinition: collectionDefinition,
             checkCollectionIds: checkCollectionIds,
             checkCategory: checkCategory,
@@ -4013,7 +4022,7 @@ function validateTieFormat(params) {
     return result;
 }
 function validateCollectionDefinition(_a) {
-    var _b = _a.checkCategory, checkCategory = _b === void 0 ? true : _b, collectionDefinition = _a.collectionDefinition, checkCollectionIds = _a.checkCollectionIds, _c = _a.checkGender, checkGender = _c === void 0 ? true : _c, referenceCategory = _a.referenceCategory, referenceGender = _a.referenceGender, eventType = _a.eventType, event = _a.event;
+    var _b = _a.checkCategory, checkCategory = _b === void 0 ? true : _b, collectionDefinition = _a.collectionDefinition, checkCollectionIds = _a.checkCollectionIds, _c = _a.checkGender, checkGender = _c === void 0 ? true : _c, referenceCategory = _a.referenceCategory, referenceGender = _a.referenceGender, event = _a.event;
     referenceGender = referenceGender !== null && referenceGender !== void 0 ? referenceGender : event === null || event === void 0 ? void 0 : event.gender;
     var stack = 'validateCollectionDefinition';
     var errors = [];
@@ -4061,7 +4070,6 @@ function validateCollectionDefinition(_a) {
     }
     if (checkGender) {
         var result = tieFormatGenderValidityCheck({
-            eventType: eventType !== null && eventType !== void 0 ? eventType : event === null || event === void 0 ? void 0 : event.eventType,
             referenceGender: referenceGender,
             matchUpType: matchUpType,
             gender: gender,
@@ -4096,10 +4104,9 @@ function validateCollectionDefinition(_a) {
 // add collectionIds if missing
 function checkTieFormat(_a) {
     var e_1, _b;
-    var tieFormat = _a.tieFormat, eventType = _a.eventType;
+    var tieFormat = _a.tieFormat;
     var result = validateTieFormat({
         checkCollectionIds: false,
-        eventType: eventType,
         tieFormat: tieFormat,
     });
     if (result.error)
@@ -4556,6 +4563,21 @@ function calculatePercentages(_a) {
     });
 }
 
+var SINGLES_MATCHUP = 'SINGLES';
+var SINGLES$1 = 'SINGLES';
+var DOUBLES_MATCHUP = 'DOUBLES';
+var DOUBLES$1 = 'DOUBLES';
+var TEAM_MATCHUP = 'TEAM';
+var TEAM$2 = 'TEAM';
+var matchUpTypes = {
+    SINGLES_MATCHUP: SINGLES_MATCHUP,
+    SINGLES: SINGLES$1,
+    DOUBLES_MATCHUP: DOUBLES_MATCHUP,
+    DOUBLES: DOUBLES$1,
+    TEAM_MATCHUP: TEAM_MATCHUP,
+    TEAM: TEAM$2,
+};
+
 function getParticipantResults(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
     var _e, _f, _g, _h, _j, _k;
@@ -5495,6 +5517,7 @@ function tallyParticipantResults(_a) {
     return result;
 }
 
+var ACTIVE_SUSPENSION = 'activeSuspension';
 var APPLIED_POLICIES = 'appliedPolicies';
 var AUDIT_POSITION_ACTIONS = 'positionActions';
 var CONTEXT = 'context';
@@ -5506,6 +5529,7 @@ var DRAW_DELETIONS = 'drawDeletions';
 var DRAW_PROFILE = 'drawProfile';
 var ENTRY_PROFILE = 'entryProfile';
 var EVENT_PROFILE = 'eventProfile';
+var EVENT_WITHDRAWAL_REQUESTS = 'eventWithdrawalRequests';
 var FACTORY$1 = 'factory';
 var FLIGHT_PROFILE = 'flightProfile';
 var GROUPING_ATTRIBUTE = 'groupingAttribute';
@@ -5524,6 +5548,7 @@ var SUB_ORDER = 'subOrder';
 var TALLY = 'tally';
 var TIE_FORMAT_MODIFICATIONS = 'tieFormatModification';
 var extensionConstants = {
+    ACTIVE_SUSPENSION: ACTIVE_SUSPENSION,
     APPLIED_POLICIES: APPLIED_POLICIES,
     AUDIT_POSITION_ACTIONS: AUDIT_POSITION_ACTIONS,
     CONTEXT: CONTEXT, // used to capture, e.g. context in which a venue was added
@@ -5535,6 +5560,7 @@ var extensionConstants = {
     DRAW_PROFILE: DRAW_PROFILE,
     ENTRY_PROFILE: ENTRY_PROFILE, // used for drawGeneration; not relevant for anonymized tournaments
     EVENT_PROFILE: EVENT_PROFILE,
+    EVENT_WITHDRAWAL_REQUESTS: EVENT_WITHDRAWAL_REQUESTS,
     FLIGHT_PROFILE: FLIGHT_PROFILE,
     GROUPING_ATTRIBUTE: GROUPING_ATTRIBUTE, // for generating teams; not relevant for anonymized tournaments
     LINEUPS: LINEUPS,
@@ -7301,8 +7327,8 @@ var eventConstants = {
 
 function getMatchUpScheduleDetails(_a) {
     var _b, _c, _d, _e, _f, e_1, _g;
-    var _h, _j, _k, _l, _m, _o, _p;
-    var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, afterRecoveryTimes = _a.afterRecoveryTimes, tournamentRecord = _a.tournamentRecord, scheduleTiming = _a.scheduleTiming, matchUpFormat = _a.matchUpFormat, matchUpType = _a.matchUpType, matchUp = _a.matchUp, event = _a.event;
+    var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+    var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, afterRecoveryTimes = _a.afterRecoveryTimes, tournamentRecord = _a.tournamentRecord, usePublishState = _a.usePublishState, scheduleTiming = _a.scheduleTiming, matchUpFormat = _a.matchUpFormat, publishStatus = _a.publishStatus, matchUpType = _a.matchUpType, matchUp = _a.matchUp, event = _a.event;
     if (!matchUp)
         return { error: MISSING_MATCHUP };
     // matchUpType is required to derive averageMatchUpMinutes and recoveryMinutes.
@@ -7330,11 +7356,11 @@ function getMatchUpScheduleDetails(_a) {
                 (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.matchUpType) ||
                 ((event === null || event === void 0 ? void 0 : event.eventType) !== TEAM$1 && (event === null || event === void 0 ? void 0 : event.eventType));
     }
-    var _q = matchUpDuration({ matchUp: matchUp }), milliseconds = _q.milliseconds, time = _q.time;
+    var _v = matchUpDuration({ matchUp: matchUp }), milliseconds = _v.milliseconds, time = _v.time;
     var startTime = matchUpStartTime({ matchUp: matchUp }).startTime;
     var endTime = matchUpEndTime({ matchUp: matchUp }).endTime;
     var schedule;
-    var _r = scheduleVisibilityFilters !== null && scheduleVisibilityFilters !== void 0 ? scheduleVisibilityFilters : {}, visibilityThreshold = _r.visibilityThreshold, eventIds = _r.eventIds, drawIds = _r.drawIds;
+    var _w = scheduleVisibilityFilters !== null && scheduleVisibilityFilters !== void 0 ? scheduleVisibilityFilters : {}, visibilityThreshold = _w.visibilityThreshold, eventIds = _w.eventIds, drawIds = _w.drawIds;
     if ((!eventIds || eventIds.includes(matchUp.eventId)) &&
         (!drawIds || drawIds.includes(matchUp.drawId))) {
         var scheduleSource = { matchUp: matchUp, visibilityThreshold: visibilityThreshold };
@@ -7391,8 +7417,8 @@ function getMatchUpScheduleDetails(_a) {
             allocatedCourt.courtName = courtInfo_1 === null || courtInfo_1 === void 0 ? void 0 : courtInfo_1.courtName;
         };
         try {
-            for (var _s = __values(allocatedCourts || []), _t = _s.next(); !_t.done; _t = _s.next()) {
-                var allocatedCourt = _t.value;
+            for (var _x = __values(allocatedCourts || []), _y = _x.next(); !_y.done; _y = _x.next()) {
+                var allocatedCourt = _y.value;
                 var state_1 = _loop_1(allocatedCourt);
                 if (state_1 === "break")
                     break;
@@ -7401,7 +7427,7 @@ function getMatchUpScheduleDetails(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_t && !_t.done && (_g = _s.return)) _g.call(_s);
+                if (_y && !_y.done && (_g = _x.return)) _g.call(_x);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -7430,16 +7456,36 @@ function getMatchUpScheduleDetails(_a) {
     }
     else {
         schedule = definedAttributes({
-            time: time,
+            milliseconds: milliseconds,
             startTime: startTime,
             endTime: endTime,
-            milliseconds: milliseconds,
+            time: time,
         });
     }
-    var hasCompletedStatus = matchUp.matchUpStatus &&
-        completedMatchUpStatuses.includes(matchUp.matchUpStatus);
     var scheduledDate = scheduledMatchUpDate({ matchUp: matchUp }).scheduledDate;
     var scheduledTime = scheduledMatchUpTime({ matchUp: matchUp }).scheduledTime;
+    if (usePublishState && ((_q = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.displaySettings) === null || _q === void 0 ? void 0 : _q.draws)) {
+        var drawSettings = publishStatus.displaySettings.draws;
+        var scheduleDetails = (_s = ((_r = drawSettings === null || drawSettings === void 0 ? void 0 : drawSettings[matchUp.drawId]) !== null && _r !== void 0 ? _r : drawSettings === null || drawSettings === void 0 ? void 0 : drawSettings.default)) === null || _s === void 0 ? void 0 : _s.scheduleDetails;
+        if (scheduleDetails) {
+            var scheduleAttributes = (_u = ((_t = scheduleDetails.find(function (details) { var _a; return scheduledDate && ((_a = details.dates) === null || _a === void 0 ? void 0 : _a.includes(scheduledDate)); })) !== null && _t !== void 0 ? _t : scheduleDetails.find(function (details) { var _a; return !((_a = details.dates) === null || _a === void 0 ? void 0 : _a.length); }))) === null || _u === void 0 ? void 0 : _u.attributes;
+            if (scheduleAttributes) {
+                // set all attributes to true
+                var template = Object.assign.apply(Object, __spreadArray(__spreadArray([{}], __read(Object.keys(schedule).map(function (key) {
+                    var _a;
+                    return (_a = {}, _a[key] = true, _a);
+                })), false), [
+                    // overwrite with publishStatus attributes
+                    scheduleAttributes], false));
+                schedule = attributeFilter({
+                    source: schedule,
+                    template: template,
+                });
+            }
+        }
+    }
+    var hasCompletedStatus = matchUp.matchUpStatus &&
+        completedMatchUpStatuses.includes(matchUp.matchUpStatus);
     var endDate = (hasCompletedStatus &&
         (extractDate(endTime) ||
             extractDate(scheduledDate) ||
@@ -9546,7 +9592,7 @@ function getSeeding(_a) {
 
 function getAllStructureMatchUps(_a) {
     var _b, _c, _d, _e, _f, _g, _h;
-    var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, tournamentAppliedPolicies = _a.tournamentAppliedPolicies, provisionalPositioning = _a.provisionalPositioning, tournamentParticipants = _a.tournamentParticipants, afterRecoveryTimes = _a.afterRecoveryTimes, policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, seedAssignments = _a.seedAssignments, contextFilters = _a.contextFilters, contextContent = _a.contextContent, matchUpFilters = _a.matchUpFilters, participantMap = _a.participantMap, scheduleTiming = _a.scheduleTiming, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, _j = _a.context, context = _j === void 0 ? {} : _j, exitProfiles = _a.exitProfiles, matchUpsMap = _a.matchUpsMap, structure = _a.structure, inContext = _a.inContext, event = _a.event;
+    var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, tournamentAppliedPolicies = _a.tournamentAppliedPolicies, provisionalPositioning = _a.provisionalPositioning, tournamentParticipants = _a.tournamentParticipants, afterRecoveryTimes = _a.afterRecoveryTimes, policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, seedAssignments = _a.seedAssignments, usePublishState = _a.usePublishState, contextFilters = _a.contextFilters, contextContent = _a.contextContent, matchUpFilters = _a.matchUpFilters, participantMap = _a.participantMap, scheduleTiming = _a.scheduleTiming, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, publishStatus = _a.publishStatus, _j = _a.context, context = _j === void 0 ? {} : _j, exitProfiles = _a.exitProfiles, matchUpsMap = _a.matchUpsMap, structure = _a.structure, inContext = _a.inContext, event = _a.event;
     var collectionPositionMatchUps = {}, roundMatchUps = {};
     tournamentParticipants =
         tournamentParticipants !== null && tournamentParticipants !== void 0 ? tournamentParticipants : tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants;
@@ -9673,6 +9719,8 @@ function getAllStructureMatchUps(_a) {
                 roundNamingProfile: roundNamingProfile,
                 initialRoundOfPlay: initialRoundOfPlay,
                 appliedPolicies: appliedPolicies,
+                usePublishState: usePublishState,
+                publishStatus: publishStatus,
                 isRoundRobin: isRoundRobin,
                 roundProfile: roundProfile,
                 matchUp: matchUp,
@@ -9728,7 +9776,7 @@ function getAllStructureMatchUps(_a) {
     };
     function addMatchUpContext(_a) {
         var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
-        var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, sourceDrawPositionRanges = _a.sourceDrawPositionRanges, drawPositionsRanges = _a.drawPositionsRanges, initialRoundOfPlay = _a.initialRoundOfPlay, additionalContext = _a.additionalContext, roundNamingProfile = _a.roundNamingProfile, tieDrawPositions = _a.tieDrawPositions, appliedPolicies = _a.appliedPolicies, isCollectionBye = _a.isCollectionBye, matchUpTieId = _a.matchUpTieId, isRoundRobin = _a.isRoundRobin, roundProfile = _a.roundProfile, sideLineUps = _a.sideLineUps, matchUp = _a.matchUp, event = _a.event;
+        var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, sourceDrawPositionRanges = _a.sourceDrawPositionRanges, drawPositionsRanges = _a.drawPositionsRanges, initialRoundOfPlay = _a.initialRoundOfPlay, additionalContext = _a.additionalContext, roundNamingProfile = _a.roundNamingProfile, tieDrawPositions = _a.tieDrawPositions, appliedPolicies = _a.appliedPolicies, isCollectionBye = _a.isCollectionBye, usePublishState = _a.usePublishState, publishStatus = _a.publishStatus, matchUpTieId = _a.matchUpTieId, isRoundRobin = _a.isRoundRobin, roundProfile = _a.roundProfile, sideLineUps = _a.sideLineUps, matchUp = _a.matchUp, event = _a.event;
         additionalContext = additionalContext !== null && additionalContext !== void 0 ? additionalContext : {};
         var tieFormat = (_b = resolveTieFormat({
             drawDefinition: drawDefinition,
@@ -9752,8 +9800,10 @@ function getAllStructureMatchUps(_a) {
             scheduleVisibilityFilters: scheduleVisibilityFilters,
             afterRecoveryTimes: afterRecoveryTimes,
             tournamentRecord: tournamentRecord,
+            usePublishState: usePublishState,
             scheduleTiming: scheduleTiming,
             matchUpFormat: matchUpFormat,
+            publishStatus: publishStatus,
             matchUpType: matchUpType,
             matchUp: matchUp,
             event: event,
@@ -9899,7 +9949,7 @@ function getAllStructureMatchUps(_a) {
             Object.assign(matchUpWithContext, makeDeepCopy({ sides: sides }, true, true));
         }
         if (tournamentParticipants && matchUpWithContext.sides) {
-            var participantAttributes_1 = policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_PARTICIPANT];
+            var participantAttributes_1 = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_PARTICIPANT];
             var getMappedParticipant_1 = function (participantId) {
                 var _a;
                 var participant = (_a = participantMap === null || participantMap === void 0 ? void 0 : participantMap[participantId]) === null || _a === void 0 ? void 0 : _a.participant;
@@ -10017,6 +10067,8 @@ function getAllStructureMatchUps(_a) {
                     additionalContext: additionalContext,
                     appliedPolicies: appliedPolicies,
                     isCollectionBye: isCollectionBye_1,
+                    usePublishState: usePublishState,
+                    publishStatus: publishStatus,
                     matchUpTieId: matchUpTieId,
                     isRoundRobin: isRoundRobin,
                     roundProfile: roundProfile,
@@ -10269,7 +10321,7 @@ function generateTieMatchUpScore(params) {
     var tieFormat = ((_c = resolveTieFormat({ matchUp: matchUp, drawDefinition: drawDefinition, structure: structure, event: event })) === null || _c === void 0 ? void 0 : _c.tieFormat) || (params === null || params === void 0 ? void 0 : params.tieFormat);
     if (!tieFormat)
         return { error: MISSING_TIE_FORMAT };
-    var result = validateTieFormat({ tieFormat: tieFormat, eventType: event === null || event === void 0 ? void 0 : event.eventType });
+    var result = validateTieFormat({ tieFormat: tieFormat });
     if (result.error)
         return result;
     var collectionDefinitions = (tieFormat === null || tieFormat === void 0 ? void 0 : tieFormat.collectionDefinitions) || [];
@@ -11439,7 +11491,7 @@ function getUpcomingInfo(params) {
 }
 
 function getStructureMatchUps(_a) {
-    var _b = _a.requireParticipants, requireParticipants = _b === void 0 ? true : _b, scheduleVisibilityFilters = _a.scheduleVisibilityFilters, tournamentAppliedPolicies = _a.tournamentAppliedPolicies, tournamentParticipants = _a.tournamentParticipants, afterRecoveryTimes = _a.afterRecoveryTimes, policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, matchUpFilters = _a.matchUpFilters, contextFilters = _a.contextFilters, contextContent = _a.contextContent, participantMap = _a.participantMap, scheduleTiming = _a.scheduleTiming, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, exitProfiles = _a.exitProfiles, matchUpsMap = _a.matchUpsMap, structureId = _a.structureId, inContext = _a.inContext, structure = _a.structure, context = _a.context, event = _a.event;
+    var _b = _a.requireParticipants, requireParticipants = _b === void 0 ? true : _b, scheduleVisibilityFilters = _a.scheduleVisibilityFilters, tournamentAppliedPolicies = _a.tournamentAppliedPolicies, tournamentParticipants = _a.tournamentParticipants, afterRecoveryTimes = _a.afterRecoveryTimes, policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, usePublishState = _a.usePublishState, matchUpFilters = _a.matchUpFilters, contextFilters = _a.contextFilters, contextContent = _a.contextContent, participantMap = _a.participantMap, scheduleTiming = _a.scheduleTiming, publishStatus = _a.publishStatus, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, exitProfiles = _a.exitProfiles, matchUpsMap = _a.matchUpsMap, structureId = _a.structureId, inContext = _a.inContext, structure = _a.structure, context = _a.context, event = _a.event;
     if (!structure && structureId) {
         (structure = findStructure({ drawDefinition: drawDefinition, structureId: structureId }).structure);
     }
@@ -11450,13 +11502,15 @@ function getStructureMatchUps(_a) {
         afterRecoveryTimes: afterRecoveryTimes,
         policyDefinitions: policyDefinitions,
         tournamentRecord: tournamentRecord,
-        drawDefinition: drawDefinition,
+        usePublishState: usePublishState,
         matchUpFilters: matchUpFilters,
         contextFilters: contextFilters,
-        contextProfile: contextProfile,
         contextContent: contextContent,
         participantMap: participantMap,
         scheduleTiming: scheduleTiming,
+        publishStatus: publishStatus,
+        contextProfile: contextProfile,
+        drawDefinition: drawDefinition,
         exitProfiles: exitProfiles,
         matchUpsMap: matchUpsMap,
         structure: structure,
@@ -11545,7 +11599,7 @@ function getDrawMatchUps(params) {
     if (!(params === null || params === void 0 ? void 0 : params.drawDefinition))
         return { error: MISSING_DRAW_DEFINITION };
     var tournamentParticipants = params.tournamentParticipants, contextContent = params.contextContent, matchUpsMap = params.matchUpsMap;
-    var scheduleVisibilityFilters = params.scheduleVisibilityFilters, tournamentAppliedPolicies = params.tournamentAppliedPolicies, requireParticipants = params.requireParticipants, participantsProfile = params.participantsProfile, afterRecoveryTimes = params.afterRecoveryTimes, policyDefinitions = params.policyDefinitions, tournamentRecord = params.tournamentRecord, contextFilters = params.contextFilters, contextProfile = params.contextProfile, drawDefinition = params.drawDefinition, matchUpFilters = params.matchUpFilters, scheduleTiming = params.scheduleTiming, participantMap = params.participantMap, nextMatchUps = params.nextMatchUps, inContext = params.inContext, context = params.context, event = params.event;
+    var scheduleVisibilityFilters = params.scheduleVisibilityFilters, tournamentAppliedPolicies = params.tournamentAppliedPolicies, requireParticipants = params.requireParticipants, participantsProfile = params.participantsProfile, afterRecoveryTimes = params.afterRecoveryTimes, policyDefinitions = params.policyDefinitions, tournamentRecord = params.tournamentRecord, usePublishState = params.usePublishState, contextFilters = params.contextFilters, matchUpFilters = params.matchUpFilters, scheduleTiming = params.scheduleTiming, participantMap = params.participantMap, publishStatus = params.publishStatus, contextProfile = params.contextProfile, drawDefinition = params.drawDefinition, nextMatchUps = params.nextMatchUps, inContext = params.inContext, context = params.context, event = params.event;
     var allAbandonedMatchUps = [];
     var allCompletedMatchUps = [];
     var allUpcomingMatchUps = [];
@@ -11595,9 +11649,11 @@ function getDrawMatchUps(params) {
             afterRecoveryTimes: afterRecoveryTimes,
             policyDefinitions: policyDefinitions,
             tournamentRecord: tournamentRecord,
+            usePublishState: usePublishState,
+            contextContent: contextContent,
             participantMap: participantMap,
             scheduleTiming: scheduleTiming,
-            contextContent: contextContent,
+            publishStatus: publishStatus,
             contextProfile: contextProfile,
             drawDefinition: drawDefinition,
             exitProfiles: exitProfiles,
@@ -17257,70 +17313,6 @@ var fixtures = {
     flagIOC: flagIOC,
 };
 
-function addNationalityCode(_a) {
-    var participant = _a.participant, withISO2 = _a.withISO2, withIOC = _a.withIOC;
-    var person = participant.person, individualParticipants = participant.individualParticipants;
-    var persons = [person, individualParticipants === null || individualParticipants === void 0 ? void 0 : individualParticipants.map(function (_a) {
-            var person = _a.person;
-            return person;
-        })]
-        .flat()
-        .filter(Boolean);
-    function annotatePerson(person) {
-        var nationalityCode = (person || {}).nationalityCode;
-        if (nationalityCode) {
-            var country = countries.find(function (_a) {
-                var iso = _a.iso;
-                return iso === nationalityCode;
-            });
-            if (withIOC && (country === null || country === void 0 ? void 0 : country.ioc) && !person.iocNationalityCode)
-                person.iocNationalityCode = country.ioc;
-            if (withISO2 && (country === null || country === void 0 ? void 0 : country.iso2) && !person.iso2NationalityCode)
-                person.iso2NationalityCode = country.iso2;
-            if ((country === null || country === void 0 ? void 0 : country.label) && !person.countryName)
-                person.countryName = country.label;
-        }
-    }
-    persons.forEach(annotatePerson);
-}
-
-function addIndividualParticipants(_a) {
-    var e_1, _b, e_2, _c;
-    var _d;
-    var participantMap = _a.participantMap, template = _a.template;
-    var participantObjects = Object.values(participantMap);
-    try {
-        for (var participantObjects_1 = __values(participantObjects), participantObjects_1_1 = participantObjects_1.next(); !participantObjects_1_1.done; participantObjects_1_1 = participantObjects_1.next()) {
-            var participantObject = participantObjects_1_1.value;
-            var participant = participantObject.participant;
-            if ((_d = participant.individualParticipantIds) === null || _d === void 0 ? void 0 : _d.length) {
-                participant.individualParticipants = [];
-                try {
-                    for (var _e = (e_2 = void 0, __values(participant.individualParticipantIds)), _f = _e.next(); !_f.done; _f = _e.next()) {
-                        var participantId = _f.value;
-                        var source = participantMap[participantId].participant;
-                        participant.individualParticipants.push(template ? attributeFilter({ template: template, source: source }) : source);
-                    }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (_f && !_f.done && (_c = _e.return)) _c.call(_e);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (participantObjects_1_1 && !participantObjects_1_1.done && (_b = participantObjects_1.return)) _b.call(participantObjects_1);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
-}
-
 function getTimeItem(_a) {
     var returnPreviousValues = _a.returnPreviousValues, itemSubTypes = _a.itemSubTypes, itemType = _a.itemType, element = _a.element;
     if (!element)
@@ -17414,6 +17406,80 @@ function getParticipantTimeItem(_a) {
     return (timeItem && { timeItem: timeItem, previousItems: previousItems }) || { info: info };
 }
 
+function getEventPublishStatus(_a) {
+    var _b, _c, _d;
+    var event = _a.event, _e = _a.status, status = _e === void 0 ? PUBLIC : _e;
+    var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
+    return (_d = (_c = (_b = getEventTimeItem({
+        itemType: itemType,
+        event: event,
+    })) === null || _b === void 0 ? void 0 : _b.timeItem) === null || _c === void 0 ? void 0 : _c.itemValue) === null || _d === void 0 ? void 0 : _d[status];
+}
+
+function addNationalityCode(_a) {
+    var participant = _a.participant, withISO2 = _a.withISO2, withIOC = _a.withIOC;
+    var person = participant.person, individualParticipants = participant.individualParticipants;
+    var persons = [person, individualParticipants === null || individualParticipants === void 0 ? void 0 : individualParticipants.map(function (_a) {
+            var person = _a.person;
+            return person;
+        })]
+        .flat()
+        .filter(Boolean);
+    function annotatePerson(person) {
+        var nationalityCode = (person || {}).nationalityCode;
+        if (nationalityCode) {
+            var country = countries.find(function (_a) {
+                var iso = _a.iso;
+                return iso === nationalityCode;
+            });
+            if (withIOC && (country === null || country === void 0 ? void 0 : country.ioc) && !person.iocNationalityCode)
+                person.iocNationalityCode = country.ioc;
+            if (withISO2 && (country === null || country === void 0 ? void 0 : country.iso2) && !person.iso2NationalityCode)
+                person.iso2NationalityCode = country.iso2;
+            if ((country === null || country === void 0 ? void 0 : country.label) && !person.countryName)
+                person.countryName = country.label;
+        }
+    }
+    persons.forEach(annotatePerson);
+}
+
+function addIndividualParticipants(_a) {
+    var e_1, _b, e_2, _c;
+    var _d;
+    var participantMap = _a.participantMap, template = _a.template;
+    var participantObjects = Object.values(participantMap);
+    try {
+        for (var participantObjects_1 = __values(participantObjects), participantObjects_1_1 = participantObjects_1.next(); !participantObjects_1_1.done; participantObjects_1_1 = participantObjects_1.next()) {
+            var participantObject = participantObjects_1_1.value;
+            var participant = participantObject.participant;
+            if ((_d = participant.individualParticipantIds) === null || _d === void 0 ? void 0 : _d.length) {
+                participant.individualParticipants = [];
+                try {
+                    for (var _e = (e_2 = void 0, __values(participant.individualParticipantIds)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        var participantId = _f.value;
+                        var source = participantMap[participantId].participant;
+                        participant.individualParticipants.push(template ? attributeFilter({ template: template, source: source }) : source);
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_f && !_f.done && (_c = _e.return)) _c.call(_e);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (participantObjects_1_1 && !participantObjects_1_1.done && (_b = participantObjects_1.return)) _b.call(participantObjects_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+}
+
 var _a$4, _b;
 var typeMap = (_a$4 = {},
     _a$4[GROUP] = 'groupParticipantIds',
@@ -17801,7 +17867,7 @@ function tournamentMatchUps(params) {
     if (!(params === null || params === void 0 ? void 0 : params.tournamentRecord))
         return { error: MISSING_TOURNAMENT_RECORD };
     var contextContent = params.contextContent;
-    var scheduleVisibilityFilters = params.scheduleVisibilityFilters, participantsProfile = params.participantsProfile, afterRecoveryTimes = params.afterRecoveryTimes, policyDefinitions = params.policyDefinitions, useParticipantMap = params.useParticipantMap, tournamentRecord = params.tournamentRecord, _d = params.inContext, inContext = _d === void 0 ? true : _d, contextFilters = params.contextFilters, contextProfile = params.contextProfile, matchUpFilters = params.matchUpFilters, nextMatchUps = params.nextMatchUps, context = params.context;
+    var scheduleVisibilityFilters = params.scheduleVisibilityFilters, participantsProfile = params.participantsProfile, afterRecoveryTimes = params.afterRecoveryTimes, policyDefinitions = params.policyDefinitions, useParticipantMap = params.useParticipantMap, tournamentRecord = params.tournamentRecord, _d = params.inContext, inContext = _d === void 0 ? true : _d, usePublishState = params.usePublishState, contextFilters = params.contextFilters, matchUpFilters = params.matchUpFilters, contextProfile = params.contextProfile, nextMatchUps = params.nextMatchUps, context = params.context;
     var tournamentId = (_a = params.tournamentId) !== null && _a !== void 0 ? _a : tournamentRecord.tournamentId;
     var events = (_b = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.events) !== null && _b !== void 0 ? _b : [];
     var _e = hydrateParticipants({
@@ -17836,6 +17902,7 @@ function tournamentMatchUps(params) {
             afterRecoveryTimes: afterRecoveryTimes,
             policyDefinitions: policyDefinitions,
             tournamentRecord: tournamentRecord,
+            usePublishState: usePublishState,
             contextFilters: contextFilters,
             contextProfile: contextProfile,
             contextContent: contextContent,
@@ -17867,7 +17934,7 @@ function eventMatchUps(params) {
     var _a;
     var _b, _c, _d;
     var tournamentParticipants = params.participants, contextContent = params.contextContent, participantMap = params.participantMap;
-    var tournamentAppliedPolicies = params.tournamentAppliedPolicies, scheduleVisibilityFilters = params.scheduleVisibilityFilters, participantsProfile = params.participantsProfile, afterRecoveryTimes = params.afterRecoveryTimes, policyDefinitions = params.policyDefinitions, useParticipantMap = params.useParticipantMap, tournamentRecord = params.tournamentRecord, contextFilters = params.contextFilters, contextProfile = params.contextProfile, matchUpFilters = params.matchUpFilters, nextMatchUps = params.nextMatchUps, tournamentId = params.tournamentId, inContext = params.inContext, context = params.context, event = params.event;
+    var tournamentAppliedPolicies = params.tournamentAppliedPolicies, scheduleVisibilityFilters = params.scheduleVisibilityFilters, participantsProfile = params.participantsProfile, afterRecoveryTimes = params.afterRecoveryTimes, policyDefinitions = params.policyDefinitions, useParticipantMap = params.useParticipantMap, tournamentRecord = params.tournamentRecord, usePublishState = params.usePublishState, contextFilters = params.contextFilters, matchUpFilters = params.matchUpFilters, contextProfile = params.contextProfile, nextMatchUps = params.nextMatchUps, tournamentId = params.tournamentId, inContext = params.inContext, context = params.context, event = params.event;
     if (!event)
         return { error: MISSING_EVENT };
     var eventId = event.eventId, eventName = event.eventName, endDate = event.endDate;
@@ -17897,6 +17964,7 @@ function eventMatchUps(params) {
             contextProfile: contextProfile,
             event: event,
         });
+    var publishStatus = getEventPublishStatus({ event: event });
     var drawDefinitions = (_d = event.drawDefinitions) !== null && _d !== void 0 ? _d : [];
     var eventResult = drawDefinitions.reduce(function (results, drawDefinition) {
         var drawMatchUpsResult = getDrawMatchUps({
@@ -17908,12 +17976,14 @@ function eventMatchUps(params) {
             afterRecoveryTimes: afterRecoveryTimes,
             policyDefinitions: policyDefinitions,
             tournamentRecord: tournamentRecord,
-            drawDefinition: drawDefinition,
+            usePublishState: usePublishState,
             contextContent: contextContent,
             contextFilters: contextFilters,
-            contextProfile: contextProfile,
             matchUpFilters: matchUpFilters,
             participantMap: participantMap,
+            publishStatus: publishStatus,
+            contextProfile: contextProfile,
+            drawDefinition: drawDefinition,
             nextMatchUps: nextMatchUps,
             inContext: inContext,
             event: event,
@@ -17933,7 +18003,7 @@ function eventMatchUps(params) {
 function drawMatchUps$1(_a) {
     var _b;
     var _c, _d, _e;
-    var tournamentParticipants = _a.participants, tournamentAppliedPolicies = _a.tournamentAppliedPolicies, scheduleVisibilityFilters = _a.scheduleVisibilityFilters, participantsProfile = _a.participantsProfile, afterRecoveryTimes = _a.afterRecoveryTimes, policyDefinitions = _a.policyDefinitions, useParticipantMap = _a.useParticipantMap, tournamentRecord = _a.tournamentRecord, contextFilters = _a.contextFilters, contextProfile = _a.contextProfile, contextContent = _a.contextContent, drawDefinition = _a.drawDefinition, matchUpFilters = _a.matchUpFilters, participantMap = _a.participantMap, nextMatchUps = _a.nextMatchUps, tournamentId = _a.tournamentId, inContext = _a.inContext, context = _a.context, event = _a.event;
+    var tournamentParticipants = _a.participants, tournamentAppliedPolicies = _a.tournamentAppliedPolicies, scheduleVisibilityFilters = _a.scheduleVisibilityFilters, participantsProfile = _a.participantsProfile, afterRecoveryTimes = _a.afterRecoveryTimes, policyDefinitions = _a.policyDefinitions, useParticipantMap = _a.useParticipantMap, tournamentRecord = _a.tournamentRecord, usePublishState = _a.usePublishState, contextFilters = _a.contextFilters, contextContent = _a.contextContent, matchUpFilters = _a.matchUpFilters, participantMap = _a.participantMap, publishStatus = _a.publishStatus, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, nextMatchUps = _a.nextMatchUps, tournamentId = _a.tournamentId, inContext = _a.inContext, context = _a.context, event = _a.event;
     var _f = event !== null && event !== void 0 ? event : {}, eventId = _f.eventId, eventName = _f.eventName, endDate = _f.endDate;
     var additionalContext = __assign(__assign({}, context), definedAttributes({
         eventId: eventId,
@@ -17971,12 +18041,14 @@ function drawMatchUps$1(_a) {
         afterRecoveryTimes: afterRecoveryTimes,
         policyDefinitions: policyDefinitions,
         tournamentRecord: tournamentRecord,
+        usePublishState: usePublishState,
         participantMap: participantMap,
-        drawDefinition: drawDefinition,
-        matchUpFilters: matchUpFilters,
+        contextContent: contextContent,
         contextFilters: contextFilters,
+        matchUpFilters: matchUpFilters,
+        publishStatus: publishStatus,
         contextProfile: contextProfile,
-        contextContent: contextContent,
+        drawDefinition: drawDefinition,
         nextMatchUps: nextMatchUps,
         inContext: inContext,
         event: event,
@@ -18732,7 +18804,7 @@ function allCompetitionMatchUps(_a) {
     return { matchUps: competitionMatchUps };
 }
 function competitionMatchUps(_a) {
-    var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, participantsProfile = _a.participantsProfile, tournamentRecords = _a.tournamentRecords, policyDefinitions = _a.policyDefinitions, matchUpFilters = _a.matchUpFilters, contextFilters = _a.contextFilters, nextMatchUps = _a.nextMatchUps, inContext = _a.inContext;
+    var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, participantsProfile = _a.participantsProfile, tournamentRecords = _a.tournamentRecords, policyDefinitions = _a.policyDefinitions, usePublishState = _a.usePublishState, matchUpFilters = _a.matchUpFilters, contextFilters = _a.contextFilters, nextMatchUps = _a.nextMatchUps, inContext = _a.inContext;
     if (typeof tournamentRecords !== 'object' ||
         !Object.keys(tournamentRecords).length)
         return { error: MISSING_TOURNAMENT_RECORDS };
@@ -18744,6 +18816,7 @@ function competitionMatchUps(_a) {
             participantsProfile: participantsProfile,
             policyDefinitions: policyDefinitions,
             tournamentRecord: tournamentRecord,
+            usePublishState: usePublishState,
             matchUpFilters: matchUpFilters,
             contextFilters: contextFilters,
             nextMatchUps: nextMatchUps,
@@ -24826,6 +24899,14 @@ function getMatchUpDailyLimits(_a) {
     return { matchUpDailyLimits: dailyLimits };
 }
 
+function getDrawPublishStatus(_a) {
+    var _b;
+    var drawDetails = _a.drawDetails, drawId = _a.drawId;
+    // TODO: check details.embargo
+    var details = (_b = drawDetails === null || drawDetails === void 0 ? void 0 : drawDetails[drawId]) === null || _b === void 0 ? void 0 : _b.publishingDetail;
+    return details === null || details === void 0 ? void 0 : details.published;
+}
+
 function scheduledSortedMatchUps(_a) {
     var e_1, _b, e_2, _c, e_3, _d, e_4, _e;
     var schedulingProfile = _a.schedulingProfile, _f = _a.matchUps, matchUps = _f === void 0 ? [] : _f;
@@ -24995,26 +25076,28 @@ function courtGridRows(_a) {
 }
 
 function competitionScheduleMatchUps(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
     if (typeof (params === null || params === void 0 ? void 0 : params.tournamentRecords) !== 'object' ||
         !Object.keys(params === null || params === void 0 ? void 0 : params.tournamentRecords).length)
         return { error: MISSING_TOURNAMENT_RECORDS };
-    var _h = getVenuesAndCourts(params), courts = _h.courts, venues = _h.venues;
+    var _k = getVenuesAndCourts(params), courts = _k.courts, venues = _k.venues;
     var getResult = getSchedulingProfile$1(params);
     var schedulingProfile = getResult.schedulingProfile;
-    var _j = params.sortDateMatchUps, sortDateMatchUps = _j === void 0 ? true : _j, courtCompletedMatchUps = params.courtCompletedMatchUps, alwaysReturnCompleted = params.alwaysReturnCompleted, activeTournamentId = params.activeTournamentId, tournamentRecords = params.tournamentRecords, withCourtGridRows = params.withCourtGridRows, minCourtGridRows = params.minCourtGridRows, usePublishState = params.usePublishState, _k = params.status, status = _k === void 0 ? PUBLIC : _k, sortCourtsData = params.sortCourtsData;
-    var timeItem = usePublishState
-        ? getTournamentTimeItem({
+    var _l = params.sortDateMatchUps, sortDateMatchUps = _l === void 0 ? true : _l, courtCompletedMatchUps = params.courtCompletedMatchUps, alwaysReturnCompleted = params.alwaysReturnCompleted, activeTournamentId = params.activeTournamentId, tournamentRecords = params.tournamentRecords, withCourtGridRows = params.withCourtGridRows, minCourtGridRows = params.minCourtGridRows, usePublishState = params.usePublishState, _m = params.status, status = _m === void 0 ? PUBLIC : _m, sortCourtsData = params.sortCourtsData;
+    // PUBLISH.STATUS is attached at the tournament level by `publishOrderOfPlay`
+    var tournamentPublishStatus = usePublishState
+        ? (_c = (_b = getTournamentTimeItem({
             tournamentRecord: tournamentRecords[activeTournamentId !== null && activeTournamentId !== void 0 ? activeTournamentId : getTournamentId()],
             itemType: "".concat(PUBLISH, ".").concat(STATUS$1),
-        }).timeItem
+        }).timeItem) === null || _b === void 0 ? void 0 : _b.itemValue) === null || _c === void 0 ? void 0 : _c[status]
         : undefined;
-    var publishStatus = (_a = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _a === void 0 ? void 0 : _a[status];
     var allCompletedMatchUps = alwaysReturnCompleted
         ? competitionMatchUps(__assign(__assign({}, params), { matchUpFilters: __assign(__assign({}, params.matchUpFilters), { matchUpStatuses: [MatchUpStatusEnum.Completed] }), contextFilters: params.contextFilters })).completedMatchUps
         : [];
+    // if { usePublishState: true } only return non-completed matchUps if there is orderOfPlay detail
     if (usePublishState &&
-        (!publishStatus || !Object.keys(publishStatus).length)) {
+        (!tournamentPublishStatus || !Object.keys(tournamentPublishStatus).length)) {
         return {
             completedMatchUps: allCompletedMatchUps,
             dateMatchUps: [],
@@ -25022,57 +25105,62 @@ function competitionScheduleMatchUps(params) {
             venues: venues,
         };
     }
-    var publishedDrawIds = usePublishState
-        ? getCompetitionPublishedDrawIds({ tournamentRecords: tournamentRecords }).drawIds
-        : undefined;
+    var publishedDrawIds, detailsMap;
+    if (usePublishState) {
+        (_a = getCompetitionPublishedDrawDetails({
+            tournamentRecords: tournamentRecords,
+        }), publishedDrawIds = _a.drawIds, detailsMap = _a.detailsMap);
+    }
     if (publishedDrawIds === null || publishedDrawIds === void 0 ? void 0 : publishedDrawIds.length) {
         if (!params.contextFilters)
             params.contextFilters = {};
-        if (!((_b = params.contextFilters) === null || _b === void 0 ? void 0 : _b.drawIds)) {
+        if (!((_d = params.contextFilters) === null || _d === void 0 ? void 0 : _d.drawIds)) {
             params.contextFilters.drawIds = publishedDrawIds;
         }
         else {
             params.contextFilters.drawIds = params.contextFilters.drawIds.filter(function (drawId) { return publishedDrawIds.includes(drawId); });
         }
     }
-    if ((_c = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.eventIds) === null || _c === void 0 ? void 0 : _c.length) {
+    if ((_e = tournamentPublishStatus === null || tournamentPublishStatus === void 0 ? void 0 : tournamentPublishStatus.eventIds) === null || _e === void 0 ? void 0 : _e.length) {
         if (!params.matchUpFilters)
             params.matchUpFilters = {};
-        if ((_d = params.matchUpFilters) === null || _d === void 0 ? void 0 : _d.eventIds) {
+        if ((_f = params.matchUpFilters) === null || _f === void 0 ? void 0 : _f.eventIds) {
             if (!params.matchUpFilters.eventIds.length) {
-                params.matchUpFilters.eventIds = publishStatus.eventIds;
+                params.matchUpFilters.eventIds = tournamentPublishStatus.eventIds;
             }
             else {
-                params.matchUpFilters.eventIds = params.matchUpFilters.eventIds.filter(function (eventId) { return publishStatus.eventIds.includes(eventId); });
+                params.matchUpFilters.eventIds = params.matchUpFilters.eventIds.filter(function (eventId) { return tournamentPublishStatus.eventIds.includes(eventId); });
             }
         }
         else {
-            params.matchUpFilters.eventIds = publishStatus.eventIds;
+            params.matchUpFilters.eventIds = tournamentPublishStatus.eventIds;
         }
     }
-    if ((_e = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.scheduledDates) === null || _e === void 0 ? void 0 : _e.length) {
+    if ((_g = tournamentPublishStatus === null || tournamentPublishStatus === void 0 ? void 0 : tournamentPublishStatus.scheduledDates) === null || _g === void 0 ? void 0 : _g.length) {
         if (!params.matchUpFilters)
             params.matchUpFilters = {};
         if (params.matchUpFilters.scheduledDates) {
             if (!params.matchUpFilters.scheduledDates.length) {
-                params.matchUpFilters.scheduledDates = publishStatus.scheduledDates;
+                params.matchUpFilters.scheduledDates =
+                    tournamentPublishStatus.scheduledDates;
             }
             else {
                 params.matchUpFilters.scheduledDates =
                     params.matchUpFilters.scheduledDates.filter(function (scheduledDate) {
-                        return publishStatus.scheduledDates.includes(scheduledDate);
+                        return tournamentPublishStatus.scheduledDates.includes(scheduledDate);
                     });
             }
         }
         else {
-            params.matchUpFilters.scheduledDates = publishStatus.scheduledDates;
+            params.matchUpFilters.scheduledDates =
+                tournamentPublishStatus.scheduledDates;
         }
     }
     // optimization: if all completed matchUps have already been retrieved, skip the hydration process
     if (alwaysReturnCompleted) {
         if (!params.matchUpFilters)
             params.matchUpFilters = {};
-        if ((_g = (_f = params.matchUpFilters) === null || _f === void 0 ? void 0 : _f.excludeMatchUpStatuses) === null || _g === void 0 ? void 0 : _g.length) {
+        if ((_j = (_h = params.matchUpFilters) === null || _h === void 0 ? void 0 : _h.excludeMatchUpStatuses) === null || _j === void 0 ? void 0 : _j.length) {
             if (!params.matchUpFilters.excludeMatchUpStatuses.includes(COMPLETED$1)) {
                 params.matchUpFilters.excludeMatchUpStatuses.push(COMPLETED$1);
             }
@@ -25081,8 +25169,47 @@ function competitionScheduleMatchUps(params) {
             params.matchUpFilters.excludeMatchUpStatuses = [COMPLETED$1];
         }
     }
-    var _l = competitionMatchUps(__assign(__assign({}, params), { matchUpFilters: params.matchUpFilters, contextFilters: params.contextFilters })), completedMatchUps = _l.completedMatchUps, upcomingMatchUps = _l.upcomingMatchUps, pendingMatchUps = _l.pendingMatchUps, groupInfo = _l.groupInfo;
+    var _o = competitionMatchUps(__assign(__assign({}, params), { matchUpFilters: params.matchUpFilters, contextFilters: params.contextFilters })), completedMatchUps = _o.completedMatchUps, upcomingMatchUps = _o.upcomingMatchUps, pendingMatchUps = _o.pendingMatchUps, groupInfo = _o.groupInfo;
     var relevantMatchUps = __spreadArray(__spreadArray([], __read((upcomingMatchUps !== null && upcomingMatchUps !== void 0 ? upcomingMatchUps : [])), false), __read((pendingMatchUps !== null && pendingMatchUps !== void 0 ? pendingMatchUps : [])), false);
+    // add any stage or structure filtering
+    if (detailsMap && Object.keys(detailsMap).length) {
+        relevantMatchUps = relevantMatchUps.filter(function (matchUp) {
+            var drawId = matchUp.drawId, structureId = matchUp.structureId, stage = matchUp.stage;
+            if (!detailsMap[drawId])
+                return false;
+            if (detailsMap[drawId].stageDetails) {
+                var stageKeys = Object.keys(detailsMap[drawId].stageDetails);
+                var unpublishedStages = stageKeys.filter(function (stage) { return !detailsMap[drawId].stageDetails[stage].published; });
+                var publishedStages = stageKeys.filter(function (stage) { return detailsMap[drawId].stageDetails[stage].published; });
+                if (unpublishedStages.length && unpublishedStages.includes(stage))
+                    return false;
+                if (publishedStages.length && publishedStages.includes(stage))
+                    return true;
+                return (unpublishedStages.length &&
+                    !unpublishedStages.includes(stage) &&
+                    !publishedStages.length);
+            }
+            if (detailsMap[drawId].structureDetails) {
+                var structureIdKeys = Object.keys(detailsMap[drawId].structureDetails);
+                var unpublishedStructureIds = structureIdKeys.filter(function (structureId) {
+                    return !detailsMap[drawId].structureDetails[structureId].published;
+                });
+                var publishedStructureIds = structureIdKeys.filter(function (structureId) {
+                    return detailsMap[drawId].structureDetails[structureId].published;
+                });
+                if (unpublishedStructureIds.length &&
+                    unpublishedStructureIds.includes(structureId))
+                    return false;
+                if (publishedStructureIds.length &&
+                    publishedStructureIds.includes(structureId))
+                    return true;
+                return (unpublishedStructureIds.length &&
+                    !unpublishedStructureIds.includes(structureId) &&
+                    !publishedStructureIds.length);
+            }
+            return true;
+        });
+    }
     var dateMatchUps = sortDateMatchUps
         ? scheduledSortedMatchUps({ matchUps: relevantMatchUps, schedulingProfile: schedulingProfile })
         : relevantMatchUps;
@@ -25092,19 +25219,19 @@ function competitionScheduleMatchUps(params) {
         return __assign({ surfaceCategory: (_a = court === null || court === void 0 ? void 0 : court.surfaceCategory) !== null && _a !== void 0 ? _a : '', matchUps: matchUps }, court);
     });
     var result = {
-        courtsData: courtsData,
         completedMatchUps: alwaysReturnCompleted
             ? allCompletedMatchUps
             : completedMatchUps, // completed matchUps for the filter date
         dateMatchUps: dateMatchUps, // all incomplete matchUps for the filter date
+        courtsData: courtsData,
         groupInfo: groupInfo,
         venues: venues,
     };
     if (withCourtGridRows) {
-        var _m = courtGridRows({
+        var _p = courtGridRows({
             minRowsCount: minCourtGridRows,
             courtsData: courtsData,
-        }), rows = _m.rows, courtPrefix = _m.courtPrefix;
+        }), rows = _p.rows, courtPrefix = _p.courtPrefix;
         result.courtPrefix = courtPrefix; // pass through for access to internal defaults by consumer
         result.rows = rows;
     }
@@ -25130,41 +25257,39 @@ function competitionScheduleMatchUps(params) {
             : courtMatchUps;
     }
 }
-function getCompetitionPublishedDrawIds(_a) {
+function getCompetitionPublishedDrawDetails(_a) {
     var e_1, _b, e_2, _c;
-    var _d, _e, _f, _g;
+    var _d, _e;
     var tournamentRecords = _a.tournamentRecords;
     var drawIds = [];
+    var detailsMap = {};
     try {
-        for (var _h = __values(Object.values(tournamentRecords)), _j = _h.next(); !_j.done; _j = _h.next()) {
-            var tournamentRecord = _j.value;
+        for (var _f = __values(Object.values(tournamentRecords)), _g = _f.next(); !_g.done; _g = _f.next()) {
+            var tournamentRecord = _g.value;
+            var _loop_1 = function (event_1) {
+                var eventPubStatus = getEventPublishStatus({ event: event_1 });
+                var drawDetails = eventPubStatus === null || eventPubStatus === void 0 ? void 0 : eventPubStatus.drawDetails;
+                if (isObject(drawDetails)) {
+                    Object.assign(detailsMap, drawDetails);
+                    drawIds.push.apply(drawIds, __spreadArray([], __read(Object.keys(drawDetails).filter(function (drawId) {
+                        return getDrawPublishStatus({ drawId: drawId, drawDetails: drawDetails });
+                    })), false));
+                }
+                else if ((_e = eventPubStatus === null || eventPubStatus === void 0 ? void 0 : eventPubStatus.drawIds) === null || _e === void 0 ? void 0 : _e.length) {
+                    // LEGACY - deprecate
+                    drawIds.push.apply(drawIds, __spreadArray([], __read(eventPubStatus.drawIds), false));
+                }
+            };
             try {
-                for (var _k = (e_2 = void 0, __values((_d = tournamentRecord.events) !== null && _d !== void 0 ? _d : [])), _l = _k.next(); !_l.done; _l = _k.next()) {
-                    var event_1 = _l.value;
-                    var timeItem = getEventTimeItem({
-                        itemType: "".concat(PUBLISH, ".").concat(STATUS$1),
-                        event: event_1,
-                    }).timeItem;
-                    var pubState = (_e = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _e === void 0 ? void 0 : _e[PUBLIC];
-                    if ((_f = pubState === null || pubState === void 0 ? void 0 : pubState.drawIds) === null || _f === void 0 ? void 0 : _f.length) {
-                        drawIds.push.apply(drawIds, __spreadArray([], __read(pubState.drawIds), false));
-                    }
-                    else {
-                        // if there are no drawIds specified then all draws are published
-                        var eventDrawIds = ((_g = event_1.drawDefinitions) !== null && _g !== void 0 ? _g : [])
-                            .map(function (_a) {
-                            var drawId = _a.drawId;
-                            return drawId;
-                        })
-                            .filter(Boolean);
-                        drawIds.push.apply(drawIds, __spreadArray([], __read(eventDrawIds), false));
-                    }
+                for (var _h = (e_2 = void 0, __values((_d = tournamentRecord.events) !== null && _d !== void 0 ? _d : [])), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var event_1 = _j.value;
+                    _loop_1(event_1);
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
+                    if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -25173,11 +25298,11 @@ function getCompetitionPublishedDrawIds(_a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
+            if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
         }
         finally { if (e_1) throw e_1.error; }
     }
-    return { drawIds: drawIds };
+    return { drawIds: drawIds, detailsMap: detailsMap };
 }
 
 var stageOrder = drawDefinitionConstants.stageOrder;
@@ -25522,23 +25647,24 @@ function getEventEntries(_a) {
 }
 
 function getEventPublishStatuses(_a) {
-    var _b;
     var event = _a.event;
-    var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
-    var timeItem = getTimeItem({
-        element: event,
-        itemType: itemType,
-    }).timeItem;
-    if ((_b = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _b === void 0 ? void 0 : _b.PUBLIC) {
-        var _c = timeItem.itemValue.PUBLIC || {}, _d = _c.drawIds, publishedDrawIds = _d === void 0 ? [] : _d, seeding = _c.seeding;
+    var eventPubStatus = getEventPublishStatus({ event: event });
+    if (eventPubStatus) {
         var publishedSeeding = {
             published: undefined, // seeding can be present for all entries in an event when no flights have been defined
             seedingScaleNames: [],
             drawIds: [], // seeding can be specific to drawIds
         };
-        if (seeding) {
-            Object.assign(publishedSeeding, timeItem.itemValue.PUBLIC.seeding);
+        if (eventPubStatus.seeding) {
+            Object.assign(publishedSeeding, eventPubStatus.seeding);
         }
+        var drawDetails_1 = eventPubStatus.drawDetails, drawIds = eventPubStatus.drawIds;
+        var publishedDrawIds = (drawDetails_1 &&
+            Object.keys(drawDetails_1).filter(function (drawId) {
+                return getDrawPublishStatus({ drawDetails: drawDetails_1, drawId: drawId });
+            })) ||
+            drawIds ||
+            [];
         return {
             publishedDrawIds: publishedDrawIds,
             publishedSeeding: publishedSeeding,
@@ -26561,7 +26687,7 @@ function getParticipantEntries(params) {
                                 // if there is a time overlap capture both the prior matchUpId and the conflicted matchUpId
                                 if (timeOverlap && !(bothPotential && sameDraw) && itemIsPrior) {
                                     var key = [scheduleItem.matchUpId, consideredItem.matchUpId]
-                                        .sort()
+                                        .sort(stringSort)
                                         .join('|');
                                     participantAggregator.scheduleConflicts[key] = {
                                         priorScheduledMatchUpId: scheduleItem.matchUpId,
@@ -28170,6 +28296,12 @@ function getValidSwapAction(_a) {
     return {};
 }
 
+/**
+ * Calculates the valid actions for a draw position based on the provided parameters.
+ *
+ * @param params - The parameters for calculating the position actions.
+ * @returns An object containing the valid actions for the draw position.
+ */
 function positionActions$1(params) {
     var _a, _b, _c, _d;
     var specifiedPolicyDefinitions = params.policyDefinitions, _e = params.tournamentParticipants, tournamentParticipants = _e === void 0 ? [] : _e, _f = params.returnParticipants, returnParticipants = _f === void 0 ? true : _f, provisionalPositioning = params.provisionalPositioning, tournamentRecord = params.tournamentRecord, drawDefinition = params.drawDefinition, drawPosition = params.drawPosition, event = params.event;
@@ -28278,12 +28410,12 @@ function positionActions$1(params) {
     var isActiveDrawPosition = activeDrawPositions.includes(drawPosition);
     if (actionsDisabled)
         return {
+            hasPositionAssigned: !!positionAssignment,
             info: 'Actions Disabled for structure',
-            isByePosition: isByePosition,
             isActiveDrawPosition: isActiveDrawPosition,
             isDrawPosition: true,
-            hasPositionAssigned: !!positionAssignment,
             validActions: [],
+            isByePosition: isByePosition,
         };
     if (isAvailableAction({ policyActions: policyActions, action: ASSIGN_PARTICIPANT }) &&
         !isActiveDrawPosition &&
@@ -28721,7 +28853,7 @@ function getStructureGroups(_a) {
 }
 
 function getDrawData(params) {
-    var _a = params.tournamentParticipants, tournamentParticipants = _a === void 0 ? [] : _a, includePositionAssignments = params.includePositionAssignments, policyDefinitions = params.policyDefinitions, tournamentRecord = params.tournamentRecord, _b = params.inContext, inContext = _b === void 0 ? true : _b, drawDefinition = params.drawDefinition, noDeepCopy = params.noDeepCopy, sortConfig = params.sortConfig, context = params.context, event = params.event;
+    var _a = params.tournamentParticipants, tournamentParticipants = _a === void 0 ? [] : _a, includePositionAssignments = params.includePositionAssignments, policyDefinitions = params.policyDefinitions, tournamentRecord = params.tournamentRecord, _b = params.inContext, inContext = _b === void 0 ? true : _b, usePublishState = params.usePublishState, drawDefinition = params.drawDefinition, publishStatus = params.publishStatus, noDeepCopy = params.noDeepCopy, sortConfig = params.sortConfig, context = params.context, event = params.event;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     var drawInfo = (function (_a) {
@@ -28789,6 +28921,8 @@ function getDrawData(params) {
                 tournamentParticipants: tournamentParticipants,
                 policyDefinitions: policyDefinitions,
                 tournamentRecord: tournamentRecord,
+                usePublishState: usePublishState,
+                publishStatus: publishStatus,
                 drawDefinition: drawDefinition,
                 inContext: inContext,
                 structure: structure,
@@ -28872,8 +29006,7 @@ function getDrawData(params) {
 }
 
 function getEventData(params) {
-    var _a;
-    var includePositionAssignments = params.includePositionAssignments, t = params.tournamentRecord, participantsProfile = params.participantsProfile, policyDefinitions = params.policyDefinitions, usePublishState = params.usePublishState, _b = params.status, status = _b === void 0 ? PUBLIC : _b, sortConfig = params.sortConfig, e = params.event;
+    var includePositionAssignments = params.includePositionAssignments, t = params.tournamentRecord, participantsProfile = params.participantsProfile, policyDefinitions = params.policyDefinitions, usePublishState = params.usePublishState, _a = params.status, status = _a === void 0 ? PUBLIC : _a, sortConfig = params.sortConfig, e = params.event;
     var tournamentRecord = makeDeepCopy(t, false, true);
     var event = makeDeepCopy(e, false, true);
     if (!tournamentRecord)
@@ -28882,33 +29015,73 @@ function getEventData(params) {
         return { error: MISSING_EVENT };
     var eventId = event.eventId;
     var tournamentId = tournamentRecord.tournamentId, endDate = tournamentRecord.endDate;
-    var timeItem = getEventTimeItem({
-        itemType: "".concat(PUBLISH, ".").concat(STATUS$1),
-        event: event,
-    }).timeItem;
-    var publishStatus = (_a = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _a === void 0 ? void 0 : _a[status];
+    var publishStatus = getEventPublishStatus({ event: event, status: status });
     var tournamentParticipants = getParticipants$1(__assign(__assign({ withGroupings: true, withEvents: false, withDraws: false }, participantsProfile), { // order is important!!
         tournamentRecord: tournamentRecord })).participants;
     var stageFilter = function (_a) {
-        var _b;
-        var stage = _a.stage;
-        return !usePublishState ||
-            !((_b = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.stages) === null || _b === void 0 ? void 0 : _b.length) ||
-            publishStatus.stages.includes(stage);
+        var _b, _c, _d;
+        var stage = _a.stage, drawId = _a.drawId;
+        if (!usePublishState)
+            return true;
+        var stageDetails = (_c = (_b = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.drawDetails) === null || _b === void 0 ? void 0 : _b[drawId]) === null || _c === void 0 ? void 0 : _c.stageDetails;
+        if (!stageDetails || !Object.keys(stageDetails).length)
+            return true;
+        return (_d = stageDetails[stage]) === null || _d === void 0 ? void 0 : _d.published;
     };
     var structureFilter = function (_a) {
-        var _b;
-        var structureId = _a.structureId;
-        return !usePublishState ||
-            !((_b = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.structureIds) === null || _b === void 0 ? void 0 : _b.length) ||
-            publishStatus.structureIds.includes(structureId);
+        var _b, _c, _d;
+        var structureId = _a.structureId, drawId = _a.drawId;
+        if (!usePublishState)
+            return true;
+        var structureDetails = (_c = (_b = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.drawDetails) === null || _b === void 0 ? void 0 : _b[drawId]) === null || _c === void 0 ? void 0 : _c.structureDetails;
+        if (!structureDetails || !Object.keys(structureDetails).length)
+            return true;
+        return (_d = structureDetails[structureId]) === null || _d === void 0 ? void 0 : _d.published;
     };
     var drawFilter = function (_a) {
-        var _b;
+        var _b, _c;
         var drawId = _a.drawId;
-        return !usePublishState ||
-            !((_b = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.drawIds) === null || _b === void 0 ? void 0 : _b.length) ||
-            publishStatus.drawIds.includes(drawId);
+        if (!usePublishState)
+            return true;
+        if (publishStatus.drawDetails) {
+            return (_c = (_b = publishStatus.drawDetails[drawId]) === null || _b === void 0 ? void 0 : _b.publishingDetail) === null || _c === void 0 ? void 0 : _c.published;
+        }
+        else if (publishStatus.drawIds) {
+            return publishStatus.drawIds.includes(drawId);
+        }
+        return true;
+    };
+    var roundLimitMapper = function (_a) {
+        var e_1, _b;
+        var _c, _d, _e, _f;
+        var drawId = _a.drawId, structure = _a.structure;
+        if (!usePublishState)
+            return structure;
+        var roundLimit = (_f = (_e = (_d = (_c = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.drawDetails) === null || _c === void 0 ? void 0 : _c[drawId]) === null || _d === void 0 ? void 0 : _d.structureDetails) === null || _e === void 0 ? void 0 : _e[structure.structureId]) === null || _f === void 0 ? void 0 : _f.roundLimit;
+        if (isConvertableInteger(roundLimit)) {
+            var roundNumbers = generateRange(1, roundLimit + 1);
+            var roundMatchUps = {};
+            var roundProfile = {};
+            try {
+                for (var roundNumbers_1 = __values(roundNumbers), roundNumbers_1_1 = roundNumbers_1.next(); !roundNumbers_1_1.done; roundNumbers_1_1 = roundNumbers_1.next()) {
+                    var roundNumber = roundNumbers_1_1.value;
+                    if (structure.roundMatchUps[roundNumber]) {
+                        roundMatchUps[roundNumber] = structure.roundMatchUps[roundNumber];
+                        roundProfile[roundNumber] = structure.roundProfile[roundNumber];
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (roundNumbers_1_1 && !roundNumbers_1_1.done && (_b = roundNumbers_1.return)) _b.call(roundNumbers_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            structure.roundMatchUps = roundMatchUps;
+            structure.roundProfile = roundProfile;
+        }
+        return structure;
     };
     var drawDefinitions = event.drawDefinitions || [];
     var drawsData = drawDefinitions
@@ -28924,15 +29097,23 @@ function getEventData(params) {
             noDeepCopy: true,
             policyDefinitions: policyDefinitions,
             tournamentRecord: tournamentRecord,
+            usePublishState: usePublishState,
             drawDefinition: drawDefinition,
+            publishStatus: publishStatus,
             sortConfig: sortConfig,
             event: event,
         }));
     })
         .map(function (_a) {
-        var _b;
         var structures = _a.structures, drawData = __rest(_a, ["structures"]);
-        return (__assign(__assign({}, drawData), { structures: (_b = structures === null || structures === void 0 ? void 0 : structures.filter(structureFilter)) === null || _b === void 0 ? void 0 : _b.filter(stageFilter) }));
+        var filteredStructures = structures === null || structures === void 0 ? void 0 : structures.filter(function (_a) {
+            var stage = _a.stage, structureId = _a.structureId;
+            return structureFilter({ structureId: structureId, drawId: drawData.drawId }) &&
+                stageFilter({ stage: stage, drawId: drawData.drawId });
+        }).map(function (structure) {
+            return roundLimitMapper({ drawId: drawData.drawId, structure: structure });
+        });
+        return __assign(__assign({}, drawData), { structures: filteredStructures });
     })
         .filter(function (drawData) { var _a; return (_a = drawData.structures) === null || _a === void 0 ? void 0 : _a.length; });
     var tournamentInfo = getTournamentInfo({ tournamentRecord: tournamentRecord }).tournamentInfo;
@@ -28969,10 +29150,7 @@ function getEventData(params) {
         eventInfo: eventInfo,
         drawsData: drawsData,
     };
-    eventData.eventInfo.publish = {
-        createdAt: timeItem === null || timeItem === void 0 ? void 0 : timeItem.createdAt,
-        state: timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue,
-    };
+    eventData.eventInfo.publish = publishStatus;
     return __assign(__assign({}, SUCCESS), { eventData: eventData });
 }
 
@@ -31929,22 +32107,18 @@ function conditionallyAdvanceDrawPosition(params) {
                 sourceSideNumber = 2;
             }
         }
-        else {
-            if (targetMatchUp.feedRound) {
-                // if different structureIds then structureId that is not equivalent to noContextTargetMatchUp.structureId is fed
-                // ... and fed positions are always sideNumber 1
-                if (sourceMatchUp.structureId === targetMatchUp.structureId) {
-                    sourceSideNumber = 2;
-                }
-                else {
-                    sourceSideNumber = 1;
-                }
+        else if (targetMatchUp.feedRound) {
+            // if different structureIds then structureId that is not equivalent to noContextTargetMatchUp.structureId is fed
+            // ... and fed positions are always sideNumber 1
+            if (sourceMatchUp.structureId === targetMatchUp.structureId) {
+                sourceSideNumber = 2;
             }
             else {
-                if (walkoverWinningSide)
-                    sourceSideNumber = 3 - walkoverWinningSide;
+                sourceSideNumber = 1;
             }
         }
+        else if (walkoverWinningSide)
+            sourceSideNumber = 3 - walkoverWinningSide;
     }
     var sourceMatchUpStatus = params.matchUpStatus;
     var pairedMatchUpStatus = pairedPreviousMatchUp === null || pairedPreviousMatchUp === void 0 ? void 0 : pairedPreviousMatchUp.matchUpStatus;
@@ -36050,10 +36224,7 @@ function modifyCollectionDefinition$1(_a) {
         modifications.push({ collectionId: collectionId, gender: gender });
     }
     var modifiedTieFormat = definedAttributes(tieFormat);
-    result = validateTieFormat({
-        tieFormat: modifiedTieFormat,
-        eventType: event === null || event === void 0 ? void 0 : event.eventType,
-    });
+    result = validateTieFormat({ tieFormat: modifiedTieFormat });
     if (result.error) {
         return decorateResult({ result: result, stack: stack });
     }
@@ -36346,8 +36517,7 @@ function removeCollectionDefinition$1(_a) {
     matchUp = matchUp !== null && matchUp !== void 0 ? matchUp : result === null || result === void 0 ? void 0 : result.matchUp;
     var existingTieFormat = result === null || result === void 0 ? void 0 : result.tieFormat;
     var tieFormat = copyTieFormat(existingTieFormat);
-    var eventType = event === null || event === void 0 ? void 0 : event.eventType;
-    result = validateTieFormat({ tieFormat: tieFormat, eventType: eventType });
+    result = validateTieFormat({ tieFormat: tieFormat });
     if (result.error)
         return decorateResult({ result: result, stack: stack });
     var targetCollection = (_e = tieFormat === null || tieFormat === void 0 ? void 0 : tieFormat.collectionDefinitions) === null || _e === void 0 ? void 0 : _e.find(function (collectionDefinition) { return collectionDefinition.collectionId === collectionId; });
@@ -36538,7 +36708,7 @@ function removeCollectionDefinition$1(_a) {
         });
     }
     var prunedTieFormat = definedAttributes(tieFormat);
-    result = validateTieFormat({ tieFormat: prunedTieFormat, eventType: eventType });
+    result = validateTieFormat({ tieFormat: prunedTieFormat });
     if (result.error)
         return decorateResult({ result: result, stack: stack });
     // TODO: implement use of tieFormats and tieFormatId
@@ -36622,8 +36792,7 @@ function addCollectionDefinition$1(_a) {
     matchUp = matchUp !== null && matchUp !== void 0 ? matchUp : result === null || result === void 0 ? void 0 : result.matchUp;
     var existingTieFormat = (_k = matchUp === null || matchUp === void 0 ? void 0 : matchUp.tieFormat) !== null && _k !== void 0 ? _k : result === null || result === void 0 ? void 0 : result.tieFormat;
     var tieFormat = copyTieFormat(existingTieFormat);
-    var eventType = event === null || event === void 0 ? void 0 : event.eventType;
-    result = validateTieFormat({ tieFormat: tieFormat, eventType: eventType });
+    result = validateTieFormat({ tieFormat: tieFormat });
     if (result === null || result === void 0 ? void 0 : result.error) {
         return decorateResult({ result: { error: result.error }, stack: stack });
     }
@@ -36667,7 +36836,7 @@ function addCollectionDefinition$1(_a) {
     var addedMatchUps = [];
     var targetMatchUps = [];
     var prunedTieFormat = definedAttributes(tieFormat);
-    result = validateTieFormat({ tieFormat: prunedTieFormat, eventType: eventType });
+    result = validateTieFormat({ tieFormat: prunedTieFormat });
     if (result === null || result === void 0 ? void 0 : result.error) {
         return decorateResult({ result: { error: result.error }, stack: stack });
     }
@@ -36989,10 +37158,7 @@ function collectionGroupUpdate(_a) {
         event: event,
     });
     var prunedTieFormat = definedAttributes(tieFormat);
-    var result = validateTieFormat({
-        eventType: event === null || event === void 0 ? void 0 : event.eventType,
-        tieFormat: prunedTieFormat,
-    });
+    var result = validateTieFormat({ tieFormat: prunedTieFormat });
     if (result.error)
         return result;
     // TODO: implement use of tieFormats and tieFormatId
@@ -37041,7 +37207,7 @@ function removeCollectionGroup$1(_a) {
     var originalValueGoal = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.valueGoal;
     var wasAggregateValue = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.aggregateValue;
     var tieFormat = copyTieFormat(existingTieFormat);
-    result = validateTieFormat({ tieFormat: tieFormat, eventType: event === null || event === void 0 ? void 0 : event.eventType });
+    result = validateTieFormat({ tieFormat: tieFormat });
     if (result.error)
         return decorateResult({ result: result, stack: stack });
     var modifiedCollectionIds = [];
@@ -37122,7 +37288,7 @@ function addCollectionGroup$1(_a) {
     var existingTieFormat = result === null || result === void 0 ? void 0 : result.tieFormat;
     var originalValueGoal = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.valueGoal;
     var tieFormat = copyTieFormat(existingTieFormat);
-    result = validateTieFormat({ tieFormat: tieFormat, eventType: event.eventType });
+    result = validateTieFormat({ tieFormat: tieFormat });
     if (result.error)
         return decorateResult({ result: result, stack: stack });
     try {
@@ -37187,10 +37353,7 @@ function modifyTieFormat$1(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
     var _e = _a.updateInProgressMatchUps, updateInProgressMatchUps = _e === void 0 ? false : _e, tieFormatComparison = _a.tieFormatComparison, modifiedTieFormat = _a.modifiedTieFormat, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, matchUpId = _a.matchUpId, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
     var stack = 'modifyTieFormat';
-    if (!validateTieFormat({
-        tieFormat: modifiedTieFormat,
-        eventType: event === null || event === void 0 ? void 0 : event.eventType,
-    }).valid) {
+    if (!validateTieFormat({ tieFormat: modifiedTieFormat }).valid) {
         return decorateResult({
             result: { error: INVALID_TIE_FORMAT },
             info: 'falied validation',
@@ -44609,10 +44772,11 @@ function generateQualifyingStructures(_a) {
             var stageSequence = 1, targetRoundQualifiersCount = 0, finalQualifyingRoundNumber = void 0, finalQualifyingStructureId = void 0, linkType = void 0;
             var _loop_1 = function (structureProfile) {
                 var _j;
-                var drawSize = structureProfile.drawSize ||
-                    coerceEven(structureProfile.participantsCount);
-                var qualifyingRoundNumber = structureProfile.qualifyingRoundNumber, qualifyingPositions = structureProfile.qualifyingPositions, structureOptions = structureProfile.structureOptions, matchUpFormat = structureProfile.matchUpFormat, structureName = structureProfile.structureName, structureId = structureProfile.structureId, drawType = structureProfile.drawType;
+                var drawSize = coerceEven(structureProfile.drawSize || structureProfile.participantsCount);
+                var qualifyingRoundNumber = structureProfile.qualifyingRoundNumber, structureOptions = structureProfile.structureOptions, matchUpFormat = structureProfile.matchUpFormat, structureName = structureProfile.structureName, structureId = structureProfile.structureId, drawType = structureProfile.drawType;
                 var matchUpType = structureProfile.matchUpType;
+                var qualifyingPositions = structureProfile.qualifyingPositions ||
+                    deriveQualifyingPositions({ drawSize: drawSize, qualifyingRoundNumber: qualifyingRoundNumber });
                 var roundLimit, structure = void 0, matchUps = void 0;
                 if (!isConvertableInteger(drawSize)) {
                     return { value: decorateResult({
@@ -44738,6 +44902,16 @@ function generateQualifyingStructures(_a) {
     }
     return __assign(__assign({ qualifiersCount: totalQualifiersCount, qualifyingDrawPositionsCount: qualifyingDrawPositionsCount, qualifyingDetails: qualifyingDetails, structures: structures }, SUCCESS), { links: links });
 }
+function deriveQualifyingPositions(_a) {
+    var drawSize = _a.drawSize, qualifyingRoundNumber = _a.qualifyingRoundNumber;
+    var qualifyingPositions = drawSize;
+    var divisionsCount = 0;
+    while (divisionsCount < qualifyingRoundNumber) {
+        qualifyingPositions = Math.floor(qualifyingPositions / 2);
+        divisionsCount += 1;
+    }
+    return qualifyingPositions;
+}
 
 function getPositionRangeMap(_a) {
     var _b;
@@ -46475,8 +46649,8 @@ function setStageQualifiersCount(_a) {
 }
 
 function generateDrawTypeAndModifyDrawDefinition$1(params) {
-    var _a, _b, _c;
-    var _d = params || {}, _e = _d.modifyOriginal, modifyOriginal = _e === void 0 ? true : _e, _f = _d.stageSequence, stageSequence = _f === void 0 ? 1 : _f, isMock = _d.isMock;
+    var _a, _b;
+    var _c = params || {}, _d = _c.modifyOriginal, modifyOriginal = _d === void 0 ? true : _d, _e = _c.stageSequence, stageSequence = _e === void 0 ? 1 : _e, isMock = _c.isMock;
     var stack = 'generateDrawTypeAndModifyDrawDefinition';
     if (!params.drawDefinition)
         return decorateResult({
@@ -46488,12 +46662,11 @@ function generateDrawTypeAndModifyDrawDefinition$1(params) {
         : makeDeepCopy(params.drawDefinition, false, true);
     var tieFormat = params.tieFormat, matchUpType = params.matchUpType;
     if (tieFormat) {
-        var eventType = (_a = params.event) === null || _a === void 0 ? void 0 : _a.eventType;
-        var result_1 = validateTieFormat({ tieFormat: tieFormat, eventType: eventType });
+        var result_1 = validateTieFormat({ tieFormat: tieFormat });
         if (result_1.error)
             return result_1;
     }
-    tieFormat = copyTieFormat(tieFormat || ((_b = resolveTieFormat({ drawDefinition: drawDefinition })) === null || _b === void 0 ? void 0 : _b.tieFormat));
+    tieFormat = copyTieFormat(tieFormat || ((_a = resolveTieFormat({ drawDefinition: drawDefinition })) === null || _a === void 0 ? void 0 : _a.tieFormat));
     matchUpType = matchUpType || drawDefinition.matchUpType || SINGLES$1;
     params.tieFormat = tieFormat;
     params.matchUpType = matchUpType;
@@ -46547,7 +46720,7 @@ function generateDrawTypeAndModifyDrawDefinition$1(params) {
     }
     var drawSize = params.drawSize || mainStageDrawPositionsCount;
     Object.assign(params, definedAttributes({ drawSize: drawSize, matchUpType: matchUpType, tieFormat: tieFormat }));
-    var _g = getAllDrawMatchUps({ drawDefinition: drawDefinition }), matchUps = _g.matchUps, matchUpsMap = _g.matchUpsMap;
+    var _f = getAllDrawMatchUps({ drawDefinition: drawDefinition }), matchUps = _f.matchUps, matchUpsMap = _f.matchUpsMap;
     if (tieFormat) {
         // if there were exiting matchUps, exclude them from this step
         matchUps === null || matchUps === void 0 ? void 0 : matchUps.forEach(function (matchUp) {
@@ -46559,7 +46732,7 @@ function generateDrawTypeAndModifyDrawDefinition$1(params) {
     }
     var inContextDrawMatchUps = addGoesTo({ drawDefinition: drawDefinition, matchUpsMap: matchUpsMap }).inContextDrawMatchUps;
     modifyDrawNotice({
-        tournamentId: (_c = params.tournamentRecord) === null || _c === void 0 ? void 0 : _c.tournamentId,
+        tournamentId: (_b = params.tournamentRecord) === null || _b === void 0 ? void 0 : _b.tournamentId,
         drawDefinition: drawDefinition,
     });
     return __assign(__assign({ inContextDrawMatchUps: inContextDrawMatchUps, drawDefinition: drawDefinition, matchUpsMap: matchUpsMap }, SUCCESS), { structures: structures, matchUps: matchUps, links: links });
@@ -49020,8 +49193,8 @@ function addVoluntaryConsolationStage$1(_a) {
 
 function generateVoluntaryConsolation$1(params) {
     var _a, _b;
-    var _c, _d, _e, _f, _g, _h, _j, _k;
-    var _l = params.drawType, drawType = _l === void 0 ? SINGLE_ELIMINATION : _l, _m = params.attachConsolation, attachConsolation = _m === void 0 ? true : _m, _o = params.applyPositioning, applyPositioning = _o === void 0 ? true : _o, tournamentRecord = params.tournamentRecord, staggeredEntry = params.staggeredEntry, // optional - specifies main structure FEED_IN for drawTypes CURTIS_CONSOLATION, FEED_IN_CHAMPIONSHIPS, FMLC
+    var _c, _d, _e, _f, _g, _h, _j;
+    var _k = params.drawType, drawType = _k === void 0 ? SINGLE_ELIMINATION : _k, _l = params.attachConsolation, attachConsolation = _l === void 0 ? true : _l, _m = params.applyPositioning, applyPositioning = _m === void 0 ? true : _m, tournamentRecord = params.tournamentRecord, staggeredEntry = params.staggeredEntry, // optional - specifies main structure FEED_IN for drawTypes CURTIS_CONSOLATION, FEED_IN_CHAMPIONSHIPS, FMLC
     automated = params.automated, placeByes = params.placeByes, isMock = params.isMock, event = params.event;
     var drawDefinition = params === null || params === void 0 ? void 0 : params.drawDefinition;
     if (!drawDefinition)
@@ -49052,13 +49225,12 @@ function generateVoluntaryConsolation$1(params) {
         return { error: INVALID_DRAW_SIZE };
     var tieFormat = params.tieFormat, matchUpType = params.matchUpType;
     if (tieFormat) {
-        var eventType = (_d = params.event) === null || _d === void 0 ? void 0 : _d.eventType;
-        var result_1 = validateTieFormat({ tieFormat: tieFormat, eventType: eventType });
+        var result_1 = validateTieFormat({ tieFormat: tieFormat });
         if (result_1.error)
             return result_1;
     }
-    tieFormat = copyTieFormat(tieFormat !== null && tieFormat !== void 0 ? tieFormat : (_e = resolveTieFormat({ drawDefinition: drawDefinition })) === null || _e === void 0 ? void 0 : _e.tieFormat);
-    matchUpType = (_f = matchUpType !== null && matchUpType !== void 0 ? matchUpType : drawDefinition.matchUpType) !== null && _f !== void 0 ? _f : TypeEnum.Singles;
+    tieFormat = copyTieFormat(tieFormat !== null && tieFormat !== void 0 ? tieFormat : (_d = resolveTieFormat({ drawDefinition: drawDefinition })) === null || _d === void 0 ? void 0 : _d.tieFormat);
+    matchUpType = (_e = matchUpType !== null && matchUpType !== void 0 ? matchUpType : drawDefinition.matchUpType) !== null && _e !== void 0 ? _e : TypeEnum.Singles;
     var stageStructures = getDrawStructures({
         stageSequence: 1,
         drawDefinition: drawDefinition,
@@ -49069,11 +49241,11 @@ function generateVoluntaryConsolation$1(params) {
     if (structureCount > 1)
         return { error: STAGE_SEQUENCE_LIMIT };
     // invalid to already have matchUps generated for any existing structure
-    if ((_h = (_g = stageStructures === null || stageStructures === void 0 ? void 0 : stageStructures[0]) === null || _g === void 0 ? void 0 : _g.matchUps) === null || _h === void 0 ? void 0 : _h.length)
+    if ((_g = (_f = stageStructures === null || stageStructures === void 0 ? void 0 : stageStructures[0]) === null || _f === void 0 ? void 0 : _f.matchUps) === null || _g === void 0 ? void 0 : _g.length)
         return { error: EXISTING_STRUCTURE };
-    var structureId = (_j = stageStructures === null || stageStructures === void 0 ? void 0 : stageStructures[0]) === null || _j === void 0 ? void 0 : _j.structureId;
+    var structureId = (_h = stageStructures === null || stageStructures === void 0 ? void 0 : stageStructures[0]) === null || _h === void 0 ? void 0 : _h.structureId;
     Object.assign(params, definedAttributes({
-        structureName: (_k = params.structureName) !== null && _k !== void 0 ? _k : constantToString(VOLUNTARY_CONSOLATION),
+        structureName: (_j = params.structureName) !== null && _j !== void 0 ? _j : constantToString(VOLUNTARY_CONSOLATION),
         structureId: structureId,
         matchUpType: matchUpType,
         tieFormat: tieFormat,
@@ -53406,7 +53578,6 @@ function getNextUnfilledDrawPositions(_a) {
     var _b = structureAssignedDrawPositions({
         structure: result.structure,
     }).positionAssignments, positionAssignments = _b === void 0 ? [] : _b;
-    // console.log('gnudp', { provisionalPositioning });
     var unfilledPositions = getNextSeedBlock({
         provisionalPositioning: provisionalPositioning,
         randomize: true,
@@ -55665,7 +55836,7 @@ function addParticipantContext(params) {
         params.withDraws) {
         // loop through all filtered events and capture events played
         (_a = params.tournamentEvents) === null || _a === void 0 ? void 0 : _a.forEach(function (rawEvent) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f;
             var event = makeDeepCopy(rawEvent, true, true);
             var flightProfile = getFlightProfile({ event: event }).flightProfile;
             var eventDrawsCount = ((_a = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _a === void 0 ? void 0 : _a.length) || ((_b = event.drawDefinitions) === null || _b === void 0 ? void 0 : _b.length) || 0;
@@ -55685,20 +55856,21 @@ function addParticipantContext(params) {
             var extensionKeys = event && Object.keys(event).filter(function (key) { return key.startsWith('_'); });
             extensionKeys === null || extensionKeys === void 0 ? void 0 : extensionKeys.forEach(function (extensionKey) { return (eventInfo[extensionKey] = event[extensionKey]); });
             var eventEntries = event.entries || [];
-            var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
-            var timeItem = getEventTimeItem({
-                itemType: itemType,
-                event: event,
-            }).timeItem;
-            if ((_c = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _c === void 0 ? void 0 : _c.PUBLIC) {
-                var _h = timeItem.itemValue.PUBLIC || {}, _j = _h.drawIds, publishedDrawIds = _j === void 0 ? [] : _j, seeding = _h.seeding;
+            var pubStatus = getEventPublishStatus({ event: event });
+            if (isObject(pubStatus)) {
+                var drawIds = pubStatus.drawIds, drawDetails_1 = pubStatus.drawDetails, seeding = pubStatus.seeding;
+                var publishedDrawIds = drawDetails_1
+                    ? Object.keys(drawDetails_1).filter(function (drawId) {
+                        return getDrawPublishStatus({ drawId: drawId, drawDetails: drawDetails_1 });
+                    })
+                    : drawIds !== null && drawIds !== void 0 ? drawIds : [];
                 var publishedSeeding = {
                     published: undefined, // seeding can be present for all entries in an event when no flights have been defined
                     seedingScaleNames: [],
                     drawIds: [], // seeding can be specific to drawIds
                 };
                 if (seeding)
-                    Object.assign(publishedSeeding, timeItem.itemValue.PUBLIC.seeding);
+                    Object.assign(publishedSeeding, pubStatus.seeding);
                 eventsPublishStatuses[eventId] = {
                     publishedDrawIds: publishedDrawIds,
                     publishedSeeding: publishedSeeding,
@@ -55769,11 +55941,11 @@ function addParticipantContext(params) {
                 });
             };
             // iterate through flights to ensure that draw entries are captured if drawDefinitions have not yet been generated
-            var drawIdsWithDefinitions = ((_d = event.drawDefinitions) === null || _d === void 0 ? void 0 : _d.map(function (_a) {
+            var drawIdsWithDefinitions = ((_c = event.drawDefinitions) === null || _c === void 0 ? void 0 : _c.map(function (_a) {
                 var drawId = _a.drawId;
                 return drawId;
             })) || [];
-            (_f = (_e = eventInfo._flightProfile) === null || _e === void 0 ? void 0 : _e.flights) === null || _f === void 0 ? void 0 : _f.forEach(function (flight) {
+            (_e = (_d = eventInfo._flightProfile) === null || _d === void 0 ? void 0 : _d.flights) === null || _e === void 0 ? void 0 : _e.forEach(function (flight) {
                 var drawId = flight.drawId, drawEntries = flight.drawEntries;
                 if (!drawIdsWithDefinitions.includes(drawId)) {
                     drawEntries === null || drawEntries === void 0 ? void 0 : drawEntries.forEach(function (drawEntry) {
@@ -55781,10 +55953,10 @@ function addParticipantContext(params) {
                     });
                 }
             });
-            var _k = getDrawDetails({
+            var _g = getDrawDetails({
                 eventEntries: eventEntries,
                 event: event,
-            }), drawDetails = _k.drawDetails, derivedInfo = _k.derivedInfo;
+            }), drawDetails = _g.drawDetails, derivedInfo = _g.derivedInfo;
             Object.assign(derivedDrawInfo, derivedInfo);
             if (event.eventType === TEAM$2 || // for TEAM events some individual attributes can only be derived by processing
                 params.withScheduleItems ||
@@ -55793,14 +55965,14 @@ function addParticipantContext(params) {
                 params.withOpponents ||
                 params.withMatchUps ||
                 params.withDraws) {
-                var matchUps = (_g = allEventMatchUps({
+                var matchUps = (_f = allEventMatchUps({
                     afterRecoveryTimes: params.scheduleAnalysis,
                     participants: allTournamentParticipants,
                     nextMatchUps: true,
                     tournamentRecord: tournamentRecord,
                     inContext: true,
                     event: event,
-                })) === null || _g === void 0 ? void 0 : _g.matchUps;
+                })) === null || _f === void 0 ? void 0 : _f.matchUps;
                 matchUps === null || matchUps === void 0 ? void 0 : matchUps.forEach(function (matchUp) {
                     return processMatchUp({
                         relevantParticipantIdsMap: relevantParticipantIdsMap,
@@ -57573,35 +57745,48 @@ var participantGovernor = {
     getParticipants: getParticipants$1,
 };
 
-function publishEventSeeding(_a) {
+function modifyEventPublishStatus(_a) {
     var _b;
-    var _c, _d, _e, _f;
-    var _g = _a.removePriorValues, removePriorValues = _g === void 0 ? true : _g, stageSeedingScaleNames = _a.stageSeedingScaleNames, seedingScaleNames = _a.seedingScaleNames, tournamentRecord = _a.tournamentRecord, _h = _a.status, status = _h === void 0 ? PUBLIC : _h, _j = _a.drawIds, drawIds = _j === void 0 ? [] : _j, event = _a.event;
+    var _c = _a.removePriorValues, removePriorValues = _c === void 0 ? true : _c, _d = _a.status, status = _d === void 0 ? PUBLIC : _d, statusObject = _a.statusObject, event = _a.event;
+    if (!isObject(statusObject))
+        return { error: INVALID_VALUES };
+    var publishStatus = getEventPublishStatus({ event: event, status: status });
+    var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
+    var updatedTimeItem = {
+        itemValue: (_b = {}, _b[status] = __assign(__assign({}, publishStatus), statusObject), _b),
+        itemType: itemType,
+    };
+    return addEventTimeItem({
+        timeItem: updatedTimeItem,
+        removePriorValues: removePriorValues,
+        event: event,
+    });
+}
+
+function publishEventSeeding(_a) {
+    var _b, _c, _d, _e;
+    var _f = _a.removePriorValues, removePriorValues = _f === void 0 ? true : _f, stageSeedingScaleNames = _a.stageSeedingScaleNames, seedingScaleNames = _a.seedingScaleNames, tournamentRecord = _a.tournamentRecord, _g = _a.status, status = _g === void 0 ? PUBLIC : _g, _h = _a.drawIds, drawIds = _h === void 0 ? [] : _h, event = _a.event;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!event)
         return { error: MISSING_EVENT };
-    var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
-    var timeItem = getEventTimeItem({
-        itemType: itemType,
-        event: event,
-    }).timeItem;
-    var itemValue = (timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) || (_b = {}, _b[status] = {}, _b);
-    var updatedSeedingScaleNames = (((_c = itemValue[status].seeding) === null || _c === void 0 ? void 0 : _c.seedingScaleNames) ||
-        seedingScaleNames) && __assign(__assign({}, (_d = itemValue[status].seeding) === null || _d === void 0 ? void 0 : _d.seedingScaleNames), seedingScaleNames);
-    var updatedStageSeedingScaleNames = (((_e = itemValue[status].seeding) === null || _e === void 0 ? void 0 : _e.stageSeedingScaleNames) ||
-        stageSeedingScaleNames) && __assign(__assign({}, (_f = itemValue[status].seeding) === null || _f === void 0 ? void 0 : _f.stageSeedingScaleNames), stageSeedingScaleNames);
-    itemValue[status].seeding = definedAttributes({
+    var eventPubStatus = getEventPublishStatus({ event: event, status: status });
+    var updatedSeedingScaleNames = (((_b = eventPubStatus === null || eventPubStatus === void 0 ? void 0 : eventPubStatus.seeding) === null || _b === void 0 ? void 0 : _b.seedingScaleNames) ||
+        seedingScaleNames) && __assign(__assign({}, (_c = eventPubStatus === null || eventPubStatus === void 0 ? void 0 : eventPubStatus.seeding) === null || _c === void 0 ? void 0 : _c.seedingScaleNames), seedingScaleNames);
+    var updatedStageSeedingScaleNames = (((_d = eventPubStatus === null || eventPubStatus === void 0 ? void 0 : eventPubStatus.seeding) === null || _d === void 0 ? void 0 : _d.stageSeedingScaleNames) ||
+        stageSeedingScaleNames) && __assign(__assign({}, (_e = eventPubStatus === null || eventPubStatus === void 0 ? void 0 : eventPubStatus.seeding) === null || _e === void 0 ? void 0 : _e.stageSeedingScaleNames), stageSeedingScaleNames);
+    var seeding = definedAttributes({
         stageSeedingScaleNames: updatedStageSeedingScaleNames,
         seedingScaleNames: updatedSeedingScaleNames,
         published: true,
         drawIds: drawIds,
     });
-    var updatedTimeItem = {
-        itemValue: itemValue,
-        itemType: itemType,
-    };
-    addEventTimeItem({ event: event, timeItem: updatedTimeItem, removePriorValues: removePriorValues });
+    modifyEventPublishStatus({
+        statusObject: { seeding: seeding },
+        removePriorValues: removePriorValues,
+        status: status,
+        event: event,
+    });
     addNotice({
         topic: PUBLISH_EVENT_SEEDING,
         payload: {
@@ -57613,51 +57798,55 @@ function publishEventSeeding(_a) {
     return __assign({}, SUCCESS);
 }
 function unPublishEventSeeding(_a) {
-    var _b, e_1, _c;
-    var _d, _e;
-    var _f = _a.removePriorValues, removePriorValues = _f === void 0 ? true : _f, seedingScaleNames = _a.seedingScaleNames, tournamentRecord = _a.tournamentRecord, _g = _a.status, status = _g === void 0 ? PUBLIC : _g, stages = _a.stages, event = _a.event;
+    var e_1, _b;
+    var _c, _d, _e;
+    var _f = _a.removePriorValues, removePriorValues = _f === void 0 ? true : _f, seedingScaleNames = _a.seedingScaleNames, tournamentRecord = _a.tournamentRecord, _g = _a.status, status = _g === void 0 ? PUBLIC : _g, drawIds = _a.drawIds, stages = _a.stages, event = _a.event;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!event)
         return { error: MISSING_EVENT };
-    var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
-    var timeItem = getEventTimeItem({
-        itemType: itemType,
-        event: event,
-    }).timeItem;
-    var itemValue = (timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) || (_b = {}, _b[status] = {}, _b);
-    if (itemValue[status]) {
-        if (Array.isArray(stages) &&
-            ((_d = itemValue[status].seeding) === null || _d === void 0 ? void 0 : _d.stageSeedingScaleNames)) {
+    var eventPubStatus = getEventPublishStatus({ event: event });
+    if (eventPubStatus) {
+        var seeding = eventPubStatus.seeding;
+        if (Array.isArray(stages) && seeding.stageSeedingScaleNames) {
             try {
                 for (var stages_1 = __values(stages), stages_1_1 = stages_1.next(); !stages_1_1.done; stages_1_1 = stages_1.next()) {
                     var stage = stages_1_1.value;
-                    if (itemValue[status].seeding.stageSeedingScaleNames[stage]) {
-                        delete itemValue[status].seeding.stageSeedingScaleNames[stage];
+                    if (seeding.stageSeedingScaleNames[stage]) {
+                        delete seeding.stageSeedingScaleNames[stage];
                     }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (stages_1_1 && !stages_1_1.done && (_c = stages_1.return)) _c.call(stages_1);
+                    if (stages_1_1 && !stages_1_1.done && (_b = stages_1.return)) _b.call(stages_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
         }
-        if (Array.isArray(seedingScaleNames) &&
-            ((_e = itemValue[status].seeding) === null || _e === void 0 ? void 0 : _e.seedingScaleNames)) {
-            itemValue[status].seeding.seedingScaleNames = itemValue[status].seeding.seedingScaleNames.filter(function (scaleName) { return !seedingScaleNames.includes(scaleName); });
+        if (Array.isArray(seedingScaleNames) && (seeding === null || seeding === void 0 ? void 0 : seeding.seedingScaleNames)) {
+            seeding.seedingScaleNames = seeding.seedingScaleNames.filter(function (scaleName) { return !seedingScaleNames.includes(scaleName); });
         }
-        if (!stages && !seedingScaleNames) {
-            delete itemValue[status].seeding;
+        if (Array.isArray(drawIds) && (seeding === null || seeding === void 0 ? void 0 : seeding.drawIds)) {
+            seeding.drawIds = seeding.drawIds.filter(function (drawId) { return !drawIds.includes(drawId); });
         }
+        if ((!Object.values((_c = seeding.stageSeedingScaleNames) !== null && _c !== void 0 ? _c : {}).length &&
+            !((_d = seeding.seedingScaleNames) === null || _d === void 0 ? void 0 : _d.length) &&
+            !((_e = seeding.drawIds) === null || _e === void 0 ? void 0 : _e.length)) ||
+            (!stages && !seedingScaleNames && !(drawIds === null || drawIds === void 0 ? void 0 : drawIds.length))) {
+            delete seeding.stageSeedingScaleNames;
+            delete seeding.seedingScaleNames;
+            delete seeding.drawIds;
+            seeding.published = false;
+        }
+        modifyEventPublishStatus({
+            statusObject: { seeding: seeding },
+            removePriorValues: removePriorValues,
+            status: status,
+            event: event,
+        });
     }
-    var updatedTimeItem = {
-        itemValue: itemValue,
-        itemType: itemType,
-    };
-    addEventTimeItem({ event: event, timeItem: updatedTimeItem, removePriorValues: removePriorValues });
     addNotice({
         topic: UNPUBLISH_EVENT_SEEDING,
         payload: {
@@ -57732,13 +57921,10 @@ function getAllEventData(_a) {
                 },
             };
         });
-        var timeItem = getEventTimeItem({
-            itemType: "".concat(PUBLISH, ".").concat(STATUS$1),
-            event: event,
-        }).timeItem;
+        var publish = getEventPublishStatus({ event: event });
         Object.assign(eventInfo, {
-            publish: timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue,
             drawsData: drawsData,
+            publish: publish,
         });
         return eventInfo;
     });
@@ -57746,6 +57932,72 @@ function getAllEventData(_a) {
     return { allEventData: allEventData };
 }
 
+function setEventDisplay(_a) {
+    var e_1, _b, e_2, _c;
+    var _d;
+    var removePriorValues = _a.removePriorValues, tournamentRecord = _a.tournamentRecord, displaySettings = _a.displaySettings, _e = _a.status, status = _e === void 0 ? PUBLIC : _e, event = _a.event;
+    if (!tournamentRecord)
+        return decorateResult({ result: { error: MISSING_TOURNAMENT_RECORD } });
+    if (!event)
+        return decorateResult({ result: { error: MISSING_EVENT } });
+    if (!isObject(displaySettings))
+        return decorateResult({ result: { error: MISSING_VALUE } });
+    // combine ScheduleDetails that are equivalent
+    if (isObject(displaySettings.draws)) {
+        try {
+            for (var _f = __values(Object.keys(displaySettings.draws)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                var key = _g.value;
+                var details = (_d = displaySettings.draws[key].scheduleDetails) !== null && _d !== void 0 ? _d : [];
+                if (details.length) {
+                    var scheduleDetails = [];
+                    var _loop_1 = function (detail) {
+                        var _h;
+                        var existingDetail = scheduleDetails.find(function (sd) {
+                            return objShallowEqual(sd.attributes, detail.attributes);
+                        });
+                        if ((existingDetail === null || existingDetail === void 0 ? void 0 : existingDetail.dates) && detail.dates) {
+                            (_h = existingDetail.dates).push.apply(_h, __spreadArray([], __read(detail.dates), false));
+                        }
+                        else {
+                            scheduleDetails.push(detail);
+                        }
+                    };
+                    try {
+                        for (var details_1 = (e_2 = void 0, __values(details)), details_1_1 = details_1.next(); !details_1_1.done; details_1_1 = details_1.next()) {
+                            var detail = details_1_1.value;
+                            _loop_1(detail);
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (details_1_1 && !details_1_1.done && (_c = details_1.return)) _c.call(details_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
+                    displaySettings.draws[key].scheduleDetails = scheduleDetails;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    }
+    var result = modifyEventPublishStatus({
+        statusObject: { displaySettings: displaySettings },
+        removePriorValues: removePriorValues,
+        status: status,
+        event: event,
+    });
+    if (result.error)
+        return result;
+    return __assign({}, SUCCESS);
+}
+
 function unPublishEvent(_a) {
     var _b;
     var _c = _a.removePriorValues, removePriorValues = _c === void 0 ? true : _c, tournamentRecord = _a.tournamentRecord, _d = _a.status, status = _d === void 0 ? PUBLIC : _d, event = _a.event;
@@ -57759,10 +58011,21 @@ function unPublishEvent(_a) {
         event: event,
     }).timeItem;
     var itemValue = (timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) || (_b = {}, _b[status] = {}, _b);
-    delete itemValue[status].structureIds;
-    delete itemValue[status].drawIds;
+    delete itemValue[status].structureIds; // legacy
+    delete itemValue[status].drawDetails;
+    delete itemValue[status].drawIds; // legacy
     var updatedTimeItem = { itemValue: itemValue, itemType: itemType };
     addEventTimeItem({ event: event, timeItem: updatedTimeItem, removePriorValues: removePriorValues });
+    modifyEventPublishStatus({
+        statusObject: {
+            structureIds: undefined,
+            drawIds: undefined,
+            seeding: undefined,
+        },
+        removePriorValues: removePriorValues,
+        status: status,
+        event: event,
+    });
     addNotice({
         topic: UNPUBLISH_EVENT,
         payload: {
@@ -57774,64 +58037,183 @@ function unPublishEvent(_a) {
 }
 
 function publishEvent(params) {
-    var _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var policyDefinitions = params.policyDefinitions, drawIds = params.drawIds, structureIds = params.structureIds, stages = params.stages;
-    var includePositionAssignments = params.includePositionAssignments, removePriorValues = params.removePriorValues, tournamentRecord = params.tournamentRecord, _o = params.status, status = _o === void 0 ? PUBLIC : _o, event = params.event, drawIdsToRemove = params.drawIdsToRemove, drawIdsToAdd = params.drawIdsToAdd, stagesToRemove = params.stagesToRemove, stagesToAdd = params.stagesToAdd, structureIdsToRemove = params.structureIdsToRemove, structureIdsToAdd = params.structureIdsToAdd;
+    var _a, e_1, _b;
+    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var includePositionAssignments = params.includePositionAssignments, removePriorValues = params.removePriorValues, tournamentRecord = params.tournamentRecord, _q = params.status, status = _q === void 0 ? PUBLIC : _q, event = params.event, drawIdsToRemove = params.drawIdsToRemove, drawIdsToAdd = params.drawIdsToAdd;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!event)
         return { error: MISSING_EVENT };
-    if (!policyDefinitions) {
-        var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord, event: event }).appliedPolicies;
-        policyDefinitions = appliedPolicies;
-    }
-    var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
-    var eventDrawIds = (_c = (_b = event.drawDefinitions) === null || _b === void 0 ? void 0 : _b.map(function (_a) {
+    // publishing will draw on scoring policy, round naming policy and participant (privacy) policy
+    var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord, event: event }).appliedPolicies;
+    var policyDefinitions = __assign(__assign({}, appliedPolicies), params.policyDefinitions);
+    var eventDrawIds = (_d = (_c = event.drawDefinitions) === null || _c === void 0 ? void 0 : _c.map(function (_a) {
         var drawId = _a.drawId;
         return drawId;
-    })) !== null && _c !== void 0 ? _c : [];
-    var timeItem = getEventTimeItem({
-        itemType: itemType,
-        event: event,
-    }).timeItem;
-    if (!drawIds && !drawIdsToAdd && !drawIdsToRemove) {
-        // by default publish all drawIds in an event
-        drawIds = eventDrawIds;
-    }
-    else if (!drawIds && ((drawIdsToAdd === null || drawIdsToAdd === void 0 ? void 0 : drawIdsToAdd.length) || (drawIdsToRemove === null || drawIdsToRemove === void 0 ? void 0 : drawIdsToRemove.length))) {
-        drawIds = ((_e = (_d = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _d === void 0 ? void 0 : _d.PUBLIC) === null || _e === void 0 ? void 0 : _e.drawIds) || [];
-    }
-    drawIds = (drawIds !== null && drawIds !== void 0 ? drawIds : []).filter(function (drawId) { return !(drawIdsToRemove === null || drawIdsToRemove === void 0 ? void 0 : drawIdsToRemove.length) || !drawIdsToRemove.includes(drawId); });
-    if (drawIdsToAdd === null || drawIdsToAdd === void 0 ? void 0 : drawIdsToAdd.length) {
-        drawIds = unique(drawIds.concat.apply(drawIds, __spreadArray([], __read(drawIdsToAdd.filter(function (drawId) { return eventDrawIds.includes(drawId); })), false)));
+    })) !== null && _d !== void 0 ? _d : [];
+    var keyedDrawIds = params.drawDetails
+        ? Object.keys(params.drawDetails)
+        : [];
+    var specifiedDrawIds = keyedDrawIds.length ? [] : params.drawIds;
+    var drawIdsToValidate = (_a = (drawIdsToAdd !== null && drawIdsToAdd !== void 0 ? drawIdsToAdd : [])).concat.apply(_a, __spreadArray(__spreadArray(__spreadArray([], __read((drawIdsToRemove !== null && drawIdsToRemove !== void 0 ? drawIdsToRemove : [])), false), __read((specifiedDrawIds !== null && specifiedDrawIds !== void 0 ? specifiedDrawIds : [])), false), __read(keyedDrawIds), false));
+    var invalidDrawIds = drawIdsToValidate.filter(function (drawId) { return !eventDrawIds.includes(drawId); });
+    if (invalidDrawIds.length) {
+        return decorateResult({
+            result: { error: DRAW_DEFINITION_NOT_FOUND },
+            context: { invalidDrawIds: invalidDrawIds },
+        });
+    }
+    var pubStatus = getEventPublishStatus({ event: event, status: status });
+    var drawDetails = (pubStatus === null || pubStatus === void 0 ? void 0 : pubStatus.drawDetails) || {};
+    var _loop_1 = function (drawId) {
+        var e_2, _r, e_3, _s, e_4, _t, e_5, _u, e_6, _v;
+        if (!drawIdsToValidate.length || drawIdsToValidate.includes(drawId)) {
+            if ((drawIdsToRemove === null || drawIdsToRemove === void 0 ? void 0 : drawIdsToRemove.includes(drawId)) ||
+                ((specifiedDrawIds === null || specifiedDrawIds === void 0 ? void 0 : specifiedDrawIds.length) && !specifiedDrawIds.includes(drawId))) {
+                drawDetails[drawId] = __assign(__assign({}, drawDetails[drawId]), { publishingDetail: { published: false } });
+            }
+            else if ((drawIdsToAdd === null || drawIdsToAdd === void 0 ? void 0 : drawIdsToAdd.includes(drawId)) ||
+                (specifiedDrawIds === null || specifiedDrawIds === void 0 ? void 0 : specifiedDrawIds.includes(drawId)) ||
+                !(specifiedDrawIds === null || specifiedDrawIds === void 0 ? void 0 : specifiedDrawIds.length)) {
+                drawDetails[drawId] = __assign(__assign({}, drawDetails[drawId]), { publishingDetail: { published: true } });
+            }
+        }
+        if ((_e = params.drawDetails) === null || _e === void 0 ? void 0 : _e[drawId]) {
+            var newDetail = params.drawDetails[drawId];
+            var structureDetails = (_f = newDetail.structureDetails) !== null && _f !== void 0 ? _f : drawDetails[drawId].structureDetails;
+            var stageDetails = (_h = (_g = newDetail.stageDetails) !== null && _g !== void 0 ? _g : drawDetails[drawId].stageDetails) !== null && _h !== void 0 ? _h : {};
+            var _w = newDetail.structureIdsToRemove, structureIdsToRemove = _w === void 0 ? [] : _w, _x = newDetail.structureIdsToAdd, structureIdsToAdd = _x === void 0 ? [] : _x, _y = newDetail.publishingDetail, publishingDetail = _y === void 0 ? {} : _y, _z = newDetail.stagesToRemove, stagesToRemove = _z === void 0 ? [] : _z, _0 = newDetail.stagesToAdd, stagesToAdd = _0 === void 0 ? [] : _0;
+            if (structureIdsToAdd || stagesToAdd)
+                publishingDetail.published = true;
+            drawDetails[drawId] = {
+                publishingDetail: publishingDetail,
+                structureDetails: structureDetails,
+                stageDetails: stageDetails,
+            };
+            if (structureIdsToAdd.length || structureIdsToRemove.length) {
+                var drawStructureIds_2 = ((_l = (_k = (_j = event.drawDefinitions) === null || _j === void 0 ? void 0 : _j.find(function (drawDefinition) { return drawDefinition.drawId === drawId; })) === null || _k === void 0 ? void 0 : _k.structures) !== null && _l !== void 0 ? _l : []).map(function (_a) {
+                    var structureId = _a.structureId;
+                    return structureId;
+                });
+                var structureIdsToValidate = (structureIdsToAdd !== null && structureIdsToAdd !== void 0 ? structureIdsToAdd : []).concat(structureIdsToRemove !== null && structureIdsToRemove !== void 0 ? structureIdsToRemove : []);
+                var invalidStructureIds = structureIdsToValidate.filter(function (structureId) { return !drawStructureIds_2.includes(structureId); });
+                if (invalidStructureIds.length) {
+                    return { value: decorateResult({
+                            result: { error: STRUCTURE_NOT_FOUND },
+                            context: { invalidStructureIds: invalidStructureIds },
+                        }) };
+                }
+                structureDetails = structureDetails !== null && structureDetails !== void 0 ? structureDetails : {};
+                try {
+                    for (var drawStructureIds_1 = (e_2 = void 0, __values(drawStructureIds_2)), drawStructureIds_1_1 = drawStructureIds_1.next(); !drawStructureIds_1_1.done; drawStructureIds_1_1 = drawStructureIds_1.next()) {
+                        var structureId = drawStructureIds_1_1.value;
+                        if (structureIdsToRemove.includes(structureId)) {
+                            structureDetails[structureId] = { published: false };
+                        }
+                        else {
+                            structureDetails[structureId] = { published: true };
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (drawStructureIds_1_1 && !drawStructureIds_1_1.done && (_r = drawStructureIds_1.return)) _r.call(drawStructureIds_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+                drawDetails[drawId].structureDetails = structureDetails;
+            }
+            var drawStages = ((_p = (_o = (_m = event.drawDefinitions) === null || _m === void 0 ? void 0 : _m.find(function (drawDefinition) { return drawDefinition.drawId === drawId; })) === null || _o === void 0 ? void 0 : _o.structures) !== null && _p !== void 0 ? _p : []).map(function (_a) {
+                var stage = _a.stage;
+                return stage;
+            });
+            if (stagesToAdd.length) {
+                try {
+                    for (var stagesToAdd_1 = (e_3 = void 0, __values(stagesToAdd)), stagesToAdd_1_1 = stagesToAdd_1.next(); !stagesToAdd_1_1.done; stagesToAdd_1_1 = stagesToAdd_1.next()) {
+                        var stage = stagesToAdd_1_1.value;
+                        stageDetails[stage] = { published: true };
+                    }
+                }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                finally {
+                    try {
+                        if (stagesToAdd_1_1 && !stagesToAdd_1_1.done && (_s = stagesToAdd_1.return)) _s.call(stagesToAdd_1);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                }
+                try {
+                    for (var drawStages_1 = (e_4 = void 0, __values(drawStages)), drawStages_1_1 = drawStages_1.next(); !drawStages_1_1.done; drawStages_1_1 = drawStages_1.next()) {
+                        var stage = drawStages_1_1.value;
+                        if (!stageDetails[stage]) {
+                            stageDetails[stage] = { published: false };
+                        }
+                    }
+                }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                finally {
+                    try {
+                        if (drawStages_1_1 && !drawStages_1_1.done && (_t = drawStages_1.return)) _t.call(drawStages_1);
+                    }
+                    finally { if (e_4) throw e_4.error; }
+                }
+            }
+            if (stagesToAdd.length || stagesToRemove.length) {
+                try {
+                    for (var stagesToRemove_1 = (e_5 = void 0, __values(stagesToRemove)), stagesToRemove_1_1 = stagesToRemove_1.next(); !stagesToRemove_1_1.done; stagesToRemove_1_1 = stagesToRemove_1.next()) {
+                        var stage = stagesToRemove_1_1.value;
+                        stageDetails[stage] = { published: false };
+                    }
+                }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (stagesToRemove_1_1 && !stagesToRemove_1_1.done && (_u = stagesToRemove_1.return)) _u.call(stagesToRemove_1);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
+                try {
+                    for (var drawStages_2 = (e_6 = void 0, __values(drawStages)), drawStages_2_1 = drawStages_2.next(); !drawStages_2_1.done; drawStages_2_1 = drawStages_2.next()) {
+                        var stage = drawStages_2_1.value;
+                        if (!stageDetails[stage]) {
+                            stageDetails[stage] = { published: true };
+                        }
+                    }
+                }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                finally {
+                    try {
+                        if (drawStages_2_1 && !drawStages_2_1.done && (_v = drawStages_2.return)) _v.call(drawStages_2);
+                    }
+                    finally { if (e_6) throw e_6.error; }
+                }
+            }
+            if (stagesToAdd.length || stagesToRemove.length) {
+                drawDetails[drawId].stageDetails = stageDetails;
+            }
+        }
+    };
+    try {
+        for (var eventDrawIds_1 = __values(eventDrawIds), eventDrawIds_1_1 = eventDrawIds_1.next(); !eventDrawIds_1_1.done; eventDrawIds_1_1 = eventDrawIds_1.next()) {
+            var drawId = eventDrawIds_1_1.value;
+            var state_1 = _loop_1(drawId);
+            if (typeof state_1 === "object")
+                return state_1.value;
+        }
     }
-    if (!structureIds &&
-        ((structureIdsToAdd === null || structureIdsToAdd === void 0 ? void 0 : structureIdsToAdd.length) || (structureIdsToRemove === null || structureIdsToRemove === void 0 ? void 0 : structureIdsToRemove.length))) {
-        structureIds = ((_g = (_f = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _f === void 0 ? void 0 : _f.PUBLIC) === null || _g === void 0 ? void 0 : _g.structureIds) || [];
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (eventDrawIds_1_1 && !eventDrawIds_1_1.done && (_b = eventDrawIds_1.return)) _b.call(eventDrawIds_1);
+        }
+        finally { if (e_1) throw e_1.error; }
     }
-    structureIds = (structureIds !== null && structureIds !== void 0 ? structureIds : []).filter(function (structureId) {
-        return !(structureIdsToRemove === null || structureIdsToRemove === void 0 ? void 0 : structureIdsToRemove.length) ||
-            !structureIdsToRemove.includes(structureId);
+    modifyEventPublishStatus({
+        statusObject: { drawDetails: drawDetails },
+        removePriorValues: removePriorValues,
+        status: status,
+        event: event,
     });
-    if (structureIdsToAdd === null || structureIdsToAdd === void 0 ? void 0 : structureIdsToAdd.length) {
-        structureIds = unique(structureIds.concat.apply(structureIds, __spreadArray([], __read(structureIdsToAdd), false)));
-    }
-    if (!stages && ((stagesToAdd === null || stagesToAdd === void 0 ? void 0 : stagesToAdd.length) || (stagesToRemove === null || stagesToRemove === void 0 ? void 0 : stagesToRemove.length))) {
-        stages = ((_j = (_h = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _h === void 0 ? void 0 : _h.PUBLIC) === null || _j === void 0 ? void 0 : _j.stages) || [];
-    }
-    stages = (stages !== null && stages !== void 0 ? stages : []).filter(function (stage) { return !(stagesToRemove === null || stagesToRemove === void 0 ? void 0 : stagesToRemove.length) || !stagesToRemove.includes(stage); });
-    if (stagesToAdd === null || stagesToAdd === void 0 ? void 0 : stagesToAdd.length) {
-        stages = unique(stages.concat.apply(stages, __spreadArray([], __read(stagesToAdd), false)));
-    }
-    var existingStatusValue = (_k = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _k === void 0 ? void 0 : _k[status];
-    var updatedTimeItem = {
-        itemValue: (_a = {},
-            _a[status] = __assign(__assign({}, existingStatusValue), { drawIds: drawIds, structureIds: structureIds, stages: stages }),
-            _a),
-        itemType: itemType,
-    };
-    addEventTimeItem({ event: event, timeItem: updatedTimeItem, removePriorValues: removePriorValues });
     var eventData = getEventData({
         includePositionAssignments: includePositionAssignments,
         usePublishState: true,
@@ -57839,13 +58221,6 @@ function publishEvent(params) {
         policyDefinitions: policyDefinitions,
         event: event,
     }).eventData;
-    // filter out drawData for unPublished draws
-    var publishState = (_m = (_l = eventData === null || eventData === void 0 ? void 0 : eventData.eventInfo) === null || _l === void 0 ? void 0 : _l.publish) === null || _m === void 0 ? void 0 : _m.state;
-    eventData.drawsData = eventData.drawsData.filter(function (_a) {
-        var _b;
-        var drawId = _a.drawId;
-        return (_b = publishState === null || publishState === void 0 ? void 0 : publishState.PUBLIC) === null || _b === void 0 ? void 0 : _b.drawIds.includes(drawId);
-    });
     addNotice({
         payload: { eventData: eventData, tournamentId: tournamentRecord.tournamentId },
         topic: PUBLISH_EVENT,
@@ -57862,6 +58237,7 @@ var publishingGovernor = {
     getDrawData: getDrawData,
     unPublishEventSeeding: unPublishEventSeeding,
     publishEventSeeding: publishEventSeeding,
+    setEventDisplay: setEventDisplay,
     unPublishEvent: unPublishEvent,
     publishEvent: publishEvent,
     unPublishOrderOfPlay: unPublishOrderOfPlay$1,
@@ -58260,7 +58636,7 @@ var sortingConstants = { ASC: ASC, ASCENDING: ASCENDING, DESC: DESC, DESCENDING:
 // by default if there are no scaleValues matching the scaleAccessor then participants will be assigned in the array order of [team].individidualParticipantIds
 function generateLineUps(params) {
     var e_1, _a, e_2, _b;
-    var _c, _d, _e, _f, _g, _h, _j, _k;
+    var _c, _d, _e, _f, _g, _h, _j;
     var tieFormat = params.tieFormat;
     var useDefaultEventRanking = params.useDefaultEventRanking, tournamentRecord = params.tournamentRecord, drawDefinition = params.drawDefinition, scaleAccessor = params.scaleAccessor, // e.g. { scaleType: 'RANKINGS', scaleName: 'U18', accessor: 'wtnRating', sortOrder: 'ASC' }
     singlesOnly = params.singlesOnly, // use singles scale for doubles events
@@ -58274,25 +58650,25 @@ function generateLineUps(params) {
         return { error: DRAW_DEFINITION_NOT_FOUND };
     tieFormat =
         tieFormat !== null && tieFormat !== void 0 ? tieFormat : (_c = resolveTieFormat({ drawDefinition: drawDefinition, event: event })) === null || _c === void 0 ? void 0 : _c.tieFormat;
-    if (validateTieFormat({ tieFormat: tieFormat, eventType: (_d = params.event) === null || _d === void 0 ? void 0 : _d.eventType }).error)
+    if (validateTieFormat({ tieFormat: tieFormat }).error)
         return { error: INVALID_TIE_FORMAT };
     if (typeof scaleAccessor !== 'object' && !useDefaultEventRanking)
         return { error: INVALID_VALUES, context: { scaleAccessor: scaleAccessor } };
     var lineUps = {};
-    var targetEntries = ((_f = (_e = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) !== null && _e !== void 0 ? _e : event === null || event === void 0 ? void 0 : event.entries) !== null && _f !== void 0 ? _f : []).filter(function (entry) { return (entry === null || entry === void 0 ? void 0 : entry.entryStatus) === DIRECT_ACCEPTANCE; });
+    var targetEntries = ((_e = (_d = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) !== null && _d !== void 0 ? _d : event === null || event === void 0 ? void 0 : event.entries) !== null && _e !== void 0 ? _e : []).filter(function (entry) { return (entry === null || entry === void 0 ? void 0 : entry.entryStatus) === DIRECT_ACCEPTANCE; });
     var participantIds = targetEntries.map(getParticipantId);
-    var _l = getParticipants$1({
+    var _k = getParticipants$1({
         withIndividualParticipants: true,
         withScaleValues: true,
         tournamentRecord: tournamentRecord,
-    }).participants, participants = _l === void 0 ? [] : _l;
+    }).participants, participants = _k === void 0 ? [] : _k;
     var teamParticipants = participants.filter(function (_a) {
         var participantId = _a.participantId;
         return participantIds.includes(participantId);
     });
     var formatScaleType = function (type) { return (type === RANKING$1 ? 'rankings' : 'ratings'); };
-    var defaultScaleName = (_h = (_g = event === null || event === void 0 ? void 0 : event.category) === null || _g === void 0 ? void 0 : _g.categoryName) !== null && _h !== void 0 ? _h : (_j = event === null || event === void 0 ? void 0 : event.category) === null || _j === void 0 ? void 0 : _j.ageCategoryCode;
-    var _m = scaleAccessor || {}, _o = _m.scaleName, scaleName = _o === void 0 ? defaultScaleName : _o, _p = _m.scaleType, scaleType = _p === void 0 ? RANKING$1 : _p, sortOrder = _m.sortOrder, accessor = _m.accessor;
+    var defaultScaleName = (_g = (_f = event === null || event === void 0 ? void 0 : event.category) === null || _f === void 0 ? void 0 : _f.categoryName) !== null && _g !== void 0 ? _g : (_h = event === null || event === void 0 ? void 0 : event.category) === null || _h === void 0 ? void 0 : _h.ageCategoryCode;
+    var _l = scaleAccessor || {}, _m = _l.scaleName, scaleName = _m === void 0 ? defaultScaleName : _m, _o = _l.scaleType, scaleType = _o === void 0 ? RANKING$1 : _o, sortOrder = _l.sortOrder, accessor = _l.accessor;
     var formattedScaleType = formatScaleType(scaleType);
     var getScaleValue = function (individualParticipant, matchUpType) {
         var _a, _b, _c;
@@ -58320,9 +58696,9 @@ function generateLineUps(params) {
     var singlesScaleSort = function (a, b) { return sortMethod(a, b, SINGLES_MATCHUP); };
     var doublesScaleSort = function (a, b) { return sortMethod(a, b, DOUBLES_MATCHUP); };
     var participantIdPairs = [];
-    var collectionDefinitions = (_k = tieFormat === null || tieFormat === void 0 ? void 0 : tieFormat.collectionDefinitions) !== null && _k !== void 0 ? _k : [];
+    var collectionDefinitions = (_j = tieFormat === null || tieFormat === void 0 ? void 0 : tieFormat.collectionDefinitions) !== null && _j !== void 0 ? _j : [];
     var _loop_1 = function (teamParticipant) {
-        var e_3, _q;
+        var e_3, _p;
         var singlesSort = teamParticipant.individualParticipants.sort(singlesScaleSort);
         var doublesSort = singlesOnly
             ? singlesSort
@@ -58369,7 +58745,7 @@ function generateLineUps(params) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (collectionDefinitions_1_1 && !collectionDefinitions_1_1.done && (_q = collectionDefinitions_1.return)) _q.call(collectionDefinitions_1);
+                if (collectionDefinitions_1_1 && !collectionDefinitions_1_1.done && (_p = collectionDefinitions_1.return)) _p.call(collectionDefinitions_1);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -61319,13 +61695,13 @@ function getPositionAssignments(_a) {
 
 function deleteDrawDefinitions(params) {
     var e_1, _a;
-    var _b, _c, _d, _e, _f, _g;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
     if (!params.tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     var stack = 'deleteDrawDefinitions';
     var drawIds = (_b = params.drawIds) !== null && _b !== void 0 ? _b : [];
     var event = params.event;
-    var _h = params.autoPublish, autoPublish = _h === void 0 ? true : _h, tournamentRecord = params.tournamentRecord, auditData = params.auditData, eventId = params.eventId, force = params.force;
+    var _k = params.autoPublish, autoPublish = _k === void 0 ? true : _k, tournamentRecord = params.tournamentRecord, auditData = params.auditData, eventId = params.eventId, force = params.force;
     var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord, event: event }).appliedPolicies;
     var policyDefinitions = __assign(__assign({}, appliedPolicies), params.policyDefinitions);
     var drawId = Array.isArray(drawIds) ? drawIds[0] : undefined;
@@ -61365,6 +61741,9 @@ function deleteDrawDefinitions(params) {
     };
     var allowDeletionWithScoresPresent = force ||
         ((_d = (_c = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_SCORING]) === null || _c === void 0 ? void 0 : _c.allowDeletionWithScoresPresent) === null || _d === void 0 ? void 0 : _d.drawDefinitions);
+    var publishStatus = (_e = getEventPublishStatus({ event: event })) !== null && _e !== void 0 ? _e : {};
+    var updatedDrawIds = (_g = (_f = publishStatus.drawIds) !== null && _f !== void 0 ? _f : (publishStatus.drawDetails && Object.keys(publishStatus.drawDetails))) !== null && _g !== void 0 ? _g : [];
+    var publishedDrawsDeleted;
     var drawIdsWithScoresPresent = [];
     var filteredDrawDefinitions = event.drawDefinitions.filter(function (drawDefinition) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -61385,6 +61764,10 @@ function deleteDrawDefinitions(params) {
                     return STRUCTURE_ENTERED_TYPES.includes(entry.entryStatus);
                 });
             }
+            if (updatedDrawIds.includes(drawId_1)) {
+                updatedDrawIds = updatedDrawIds.filter(function (id) { return id !== drawId_1; });
+                publishedDrawsDeleted = true;
+            }
             var mainStructure = (_f = (_e = getDrawStructures({
                 stageSequence: 1,
                 drawDefinition: drawDefinition,
@@ -61414,6 +61797,7 @@ function deleteDrawDefinitions(params) {
                     return { positionAssignments: positionAssignments, stageSequence: stageSequence };
                 })
                 : undefined;
+            // TODO: conditionally add auditTrail based on policyDefinitions
             var audit = {
                 action: DELETE_DRAW_DEFINITIONS,
                 payload: {
@@ -61457,43 +61841,29 @@ function deleteDrawDefinitions(params) {
     }
     // cleanup references to drawId in schedulingProfile extension
     checkSchedulingProfile({ tournamentRecord: tournamentRecord });
-    var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
-    var timeItem = getTimeItem({ element: event, itemType: itemType }).timeItem;
-    var publishStatus = (_e = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _e === void 0 ? void 0 : _e[PUBLIC];
-    var publishedDrawsDeleted;
-    var _loop_1 = function (drawId_2) {
-        var _j;
-        var drawPublished = (_f = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.drawIds) === null || _f === void 0 ? void 0 : _f.includes(drawId_2);
-        if (drawPublished) {
-            publishedDrawsDeleted = true;
-            var updatedDrawIds = ((_g = publishStatus.drawIds) === null || _g === void 0 ? void 0 : _g.filter(function (publishedDrawId) { return publishedDrawId !== drawId_2; })) || [];
-            var timeItem_1 = {
-                itemType: "".concat(PUBLISH, ".").concat(STATUS$1),
-                itemValue: (_j = {},
-                    _j[PUBLIC] = {
-                        drawIds: updatedDrawIds,
-                    },
-                    _j),
-            };
-            var result = addEventTimeItem({ event: event, timeItem: timeItem_1 });
-            if (result.error)
-                return { value: { error: result.error } };
-        }
-    };
-    try {
-        for (var drawIds_1 = __values(drawIds), drawIds_1_1 = drawIds_1.next(); !drawIds_1_1.done; drawIds_1_1 = drawIds_1.next()) {
-            var drawId_2 = drawIds_1_1.value;
-            var state_1 = _loop_1(drawId_2);
-            if (typeof state_1 === "object")
-                return state_1.value;
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
+    if (publishedDrawsDeleted) {
+        var drawDetails = {};
         try {
-            if (drawIds_1_1 && !drawIds_1_1.done && (_a = drawIds_1.return)) _a.call(drawIds_1);
+            for (var updatedDrawIds_1 = __values(updatedDrawIds), updatedDrawIds_1_1 = updatedDrawIds_1.next(); !updatedDrawIds_1_1.done; updatedDrawIds_1_1 = updatedDrawIds_1.next()) {
+                var drawId_2 = updatedDrawIds_1_1.value;
+                drawDetails[drawId_2] = (_j = (_h = publishStatus.drawDetails) === null || _h === void 0 ? void 0 : _h[drawId_2]) !== null && _j !== void 0 ? _j : {
+                    published: true,
+                };
+            }
         }
-        finally { if (e_1) throw e_1.error; }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (updatedDrawIds_1_1 && !updatedDrawIds_1_1.done && (_a = updatedDrawIds_1.return)) _a.call(updatedDrawIds_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        var result = modifyEventPublishStatus({
+            statusObject: { drawDetails: drawDetails },
+            event: event,
+        });
+        if (result.error)
+            return { error: result.error };
     }
     if (auditTrail.length) {
         addNotice({ topic: AUDIT, payload: auditTrail });
@@ -61509,9 +61879,14 @@ function deleteDrawDefinitions(params) {
     });
     addDrawDeletionTelemetry({ event: event, deletedDrawsDetail: deletedDrawsDetail, auditData: auditData });
     if (autoPublish && publishedDrawsDeleted) {
-        var result = publishEvent({ tournamentRecord: tournamentRecord, event: event, policyDefinitions: policyDefinitions });
+        var result = publishEvent({
+            drawIdsToRemove: drawIds,
+            policyDefinitions: policyDefinitions,
+            tournamentRecord: tournamentRecord,
+            event: event,
+        });
         if (result.error)
-            console.log('publish error', result);
+            return __assign(__assign({}, SUCCESS), { info: result.error });
     }
     return __assign({}, SUCCESS);
 }
@@ -62161,10 +62536,7 @@ function addEvent(_a) {
     var eventRecord = __assign({ drawDefinitions: [], eventType: TypeEnum.Singles, entries: [], startDate: startDate, endDate: endDate }, event);
     if (event.eventType === TypeEnum.Team) {
         if (event.tieFormat) {
-            var result = validateTieFormat({
-                tieFormat: event.tieFormat,
-                eventType: event.eventType,
-            });
+            var result = validateTieFormat({ tieFormat: event.tieFormat });
             if (result.error)
                 return result;
         }
@@ -64800,7 +65172,6 @@ function generateDrawDefinition(params) {
             gender: event === null || event === void 0 ? void 0 : event.gender,
             enforceGender: enforceGender,
             tieFormat: tieFormat,
-            event: event,
         });
         if (result.error)
             return decorateResult({ result: result, stack: stack });
@@ -64828,10 +65199,7 @@ function generateDrawDefinition(params) {
         // there is no need to attach to the drawDefinition
         if (!equivalentInScope) {
             if (tieFormat) {
-                var result = checkTieFormat({
-                    eventType: event.eventType,
-                    tieFormat: tieFormat,
-                });
+                var result = checkTieFormat({ tieFormat: tieFormat });
                 if (result.error)
                     return decorateResult({ result: result, stack: stack });
                 drawDefinition.tieFormat = (_13 = result.tieFormat) !== null && _13 !== void 0 ? _13 : tieFormat;
@@ -65173,7 +65541,7 @@ function generateDrawDefinition(params) {
     }
     drawDefinition.drawName =
         (_33 = params.drawName) !== null && _33 !== void 0 ? _33 : (drawType && constantToString(drawType));
-    if (typeof voluntaryConsolation === 'object') {
+    if (typeof voluntaryConsolation === 'object' && drawSize >= 4) {
         addVoluntaryConsolationStructure(__assign(__assign({}, voluntaryConsolation), { tournamentRecord: tournamentRecord, appliedPolicies: appliedPolicies, drawDefinition: drawDefinition, matchUpType: matchUpType }));
     }
     if (addToEvent) {
@@ -66375,10 +66743,8 @@ function bulkUpdatePublishedEventIds(_a) {
             if (!eventIdsMap[eventId]) {
                 eventIdsMap[eventId] = [drawId];
             }
-            else {
-                if (!eventIdsMap[eventId].includes(drawId)) {
-                    eventIdsMap[eventId].push(drawId);
-                }
+            else if (!eventIdsMap[eventId].includes(drawId)) {
+                eventIdsMap[eventId].push(drawId);
             }
         }
         return eventIdsMap;
@@ -66389,15 +66755,16 @@ function bulkUpdatePublishedEventIds(_a) {
     });
     var publishedEventIds = relevantEvents
         .filter(function (event) {
-        var timeItem = getEventTimeItem({
-            itemType: "".concat(PUBLISH, ".").concat(STATUS$1),
-            event: event,
-        }).timeItem;
-        var pubState = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue;
+        var pubStatus = getEventPublishStatus({ event: event });
+        var _a = pubStatus !== null && pubStatus !== void 0 ? pubStatus : {}, drawDetails = _a.drawDetails, drawIds = _a.drawIds;
         var eventId = event.eventId;
         var publishedDrawIds = eventIdsMap[eventId].filter(function (drawId) {
-            var _a, _b;
-            return (_b = (_a = pubState === null || pubState === void 0 ? void 0 : pubState[PUBLIC]) === null || _a === void 0 ? void 0 : _a.drawIds) === null || _b === void 0 ? void 0 : _b.includes(drawId);
+            var keyedDrawIds = drawDetails
+                ? Object.keys(pubStatus.drawDetails).filter(function (drawId) {
+                    return getDrawPublishStatus({ drawId: drawId, drawDetails: drawDetails });
+                })
+                : [];
+            return (drawIds === null || drawIds === void 0 ? void 0 : drawIds.includes(drawId)) || keyedDrawIds.includes(drawId);
         });
         return publishedDrawIds.length;
     })