tods-competition-factory 1.8.3 → 1.8.5

package/dist/forge/transform.mjs

@@ -72,7 +72,7 @@ function groupConsecutiveNumbers(arr) {
     return result;
   }, []);
 }
-function allNumeric(arr) {
+function allNumeric$1(arr) {
   return arr.reduce((numeric, item) => !isNaN(parseInt(item)) && numeric, true);
 }
 function noNumeric(arr) {
@@ -365,10 +365,18 @@ const MISSING_CONTEXT = {
   message: "Missing context",
   code: "ERR_MISSING_CONTEXT"
 };
+const INVALID_COLLECTION_DEFINITION = {
+  message: "Invalid collectionDefinition",
+  code: "ERR_INVALID_COLLECTION_DEFINITION"
+};
 const INVALID_OBJECT = {
   message: "Invalid object",
   code: "ERR_INVALID_OBJECT"
 };
+const INVALID_CATEGORY = {
+  message: "Invalid category",
+  code: "ERR_INVALID_CATEGORY"
+};
 const INVALID_VALUES = {
   message: "Invalid values",
   code: "ERR_INVALID_VALUES"
@@ -574,7 +582,11 @@ function addNotice(notice) {
 function getTopics() {
   return _globalStateProvider.getTopics();
 }
+function getProvider() {
+  return _globalStateProvider;
+}
 
+const validDateString = /^[\d]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][\d]|3[0-1])$/;
 const validTimeString = /^((0[\d]|1[\d]|2[0-3]):[0-5][\d](:[0-5][\d])?)([.,][0-9]{3})?$/;
 const dateValidation = /^([\d]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][\d]|3[0-1]))([ T](0[\d]|1[\d]|2[0-3]):[0-5][\d](:[0-5][\d])?)?([.,][\d]{3})?Z?$/;
 const timeValidation = /^([\d]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][\d]|3[0-1]))?([ T]?(0[\d]|1[\d]|2[0-3]):[0-5][\d](:[0-5][\d])?)?([.,][\d]{3})?Z?$/;
@@ -605,6 +617,9 @@ function validTimeValue(value) {
     return false;
   return !!(!value || timeValidation.test(convertTime(value, true, true)));
 }
+function isValidDateString(scheduleDate) {
+  return isISODateString(scheduleDate) || validDateString.test(scheduleDate);
+}
 const getUTCdateString = (date) => {
   const dateDate = isDate(date) || isISODateString(date) ? new Date(date) : /* @__PURE__ */ new Date();
   const monthNumber = dateDate.getUTCMonth() + 1;
@@ -762,6 +777,13 @@ function sameDay(date1, date2) {
 }
 
 function makeDeepCopy(sourceObject, convertExtensions, internalUse, removeExtensions, iteration = 0) {
+  if (getProvider().makeDeepCopy)
+    return getProvider().makeDeepCopy(
+      sourceObject,
+      convertExtensions,
+      internalUse,
+      removeExtensions
+    );
   const deepCopy = deepCopyEnabled();
   const { stringify, toJSON, ignore, modulate } = deepCopy || {};
   if (!deepCopy?.enabled && !internalUse || typeof sourceObject !== "object" || typeof sourceObject === "function" || sourceObject === null || typeof deepCopy?.threshold === "number" && iteration >= deepCopy.threshold) {
@@ -1411,6 +1433,208 @@ function removeTournamentExtension(params) {
   });
 }
 
+const typeMatch = (arr, type) => arr.filter(Boolean).every((i) => typeof i === type);
+const allNumeric = (arr) => arr.filter(Boolean).every(isNumeric);
+function getCategoryAgeDetails(params) {
+  const category = params.category;
+  if (typeof category !== "object")
+    return { error: INVALID_CATEGORY };
+  let { ageCategoryCode, ageMaxDate, ageMinDate, ageMax, ageMin } = category;
+  const categoryName = category.categoryName;
+  let combinedAge;
+  if (!typeMatch(
+    [ageCategoryCode, ageMaxDate, ageMinDate, categoryName],
+    "string"
+  ) || !allNumeric(
+    [ageMax, ageMin]
+  ))
+    return { error: INVALID_CATEGORY };
+  const consideredDate = params.consideredDate ?? extractDate((/* @__PURE__ */ new Date()).toLocaleDateString("sv"));
+  if (!isValidDateString(consideredDate))
+    return { error: INVALID_DATE };
+  const [consideredYear] = consideredDate.split("-").slice(0, 3).map((n) => parseInt(n));
+  const previousDayDate = dateStringDaysChange(consideredDate, -1);
+  const [previousDayMonth, previousDay] = previousDayDate.split("-").slice(1, 3).map((n) => parseInt(n));
+  const previousMonthDay = `${zeroPad(previousDayMonth)}-${zeroPad(
+    previousDay
+  )}`;
+  const nextDayDate = dateStringDaysChange(consideredDate, 1);
+  const [nextDayMonth, nextDay] = nextDayDate.split("-").slice(1, 3).map((n) => parseInt(n));
+  const nextMonthDay = `${zeroPad(nextDayMonth)}-${zeroPad(nextDay)}`;
+  let calculatedAgeMaxDate = ageMin && dateStringDaysChange(consideredDate, -1 * 365 * ageMin);
+  let calculatedAgeMinDate = ageMax && dateStringDaysChange(consideredDate, -1 * 365 * ageMax);
+  const errors = [];
+  const addError = (errorString) => !errors.includes(errorString) && errors.push(errorString);
+  ageCategoryCode = ageCategoryCode ?? categoryName;
+  const prePost = /^([UO]?)(\d{1,2})([UO]?)$/;
+  const extractCombined = /^C(\d{1,2})-(\d{1,2})$/;
+  const isBetween = ageCategoryCode?.includes("-");
+  const isCombined = isBetween && ageCategoryCode?.match(extractCombined);
+  const isCoded = ageCategoryCode?.match(prePost);
+  const constructedDate = (y, df) => `${y}-${df}`;
+  const uPre = (ageInt) => {
+    const ageMinYear = consideredYear - ageInt;
+    const newMinDate = constructedDate(ageMinYear, nextMonthDay);
+    if (category.ageMinDate && category.ageMinDate !== newMinDate)
+      addError(`Invalid submitted ageMinDate: ${ageMinDate}`);
+    ageMinDate = newMinDate;
+    if (ageCategoryCode) {
+      if (category.ageMax && category.ageMax !== ageInt - 1) {
+        addError(`Invalid submitted ageMax: ${ageMax}`);
+        calculatedAgeMinDate = void 0;
+      }
+      ageMax = ageInt - 1;
+    }
+  };
+  const uPost = (ageInt) => {
+    const ageMinYear = consideredYear - ageInt - 1;
+    const newMinDate = constructedDate(ageMinYear, nextMonthDay);
+    if (category.ageMin && category.ageMin > ageInt) {
+      addError(`Invalid submitted ageMin: ${ageMin}`);
+    }
+    if (category.ageMax && category.ageMax > ageInt) {
+      addError(`Invalid submitted ageMax: ${ageMax}`);
+    }
+    if (category.ageMinDate && category.ageMinDate !== newMinDate)
+      addError(`Invalid submitted ageMinDate: ${ageMinDate}`);
+    ageMinDate = newMinDate;
+    if (ageCategoryCode) {
+      if (category.ageMax && category.ageMax !== ageInt) {
+        addError(`Invalid submitted ageMax: ${ageMax}`);
+        calculatedAgeMaxDate = void 0;
+      }
+      ageMax = ageInt;
+    }
+  };
+  const oPre = (ageInt) => {
+    const ageMaxYear = consideredYear - ageInt;
+    const newMaxDate = constructedDate(ageMaxYear, previousMonthDay);
+    if (category.ageMaxDate && category.ageMaxDate !== newMaxDate)
+      addError(`Invalid submitted ageMaxDate: ${ageMaxDate}`);
+    ageMaxDate = newMaxDate;
+    if (ageCategoryCode) {
+      if (category.ageMin && category.ageMin !== ageInt + 1) {
+        addError(`Invalid submitted ageMin: ${ageMin}`);
+        calculatedAgeMaxDate = void 0;
+      }
+      ageMin = ageInt + 1;
+    }
+  };
+  const oPost = (ageInt) => {
+    const ageMaxYear = consideredYear - ageInt - 1;
+    const newMaxDate = constructedDate(ageMaxYear, previousMonthDay);
+    if (category.ageMaxDate && category.ageMaxDate !== newMaxDate)
+      addError(`Invalid submitted ageMaxDate: ${ageMaxDate}`);
+    ageMaxDate = newMaxDate;
+    if (ageCategoryCode) {
+      if (category.ageMin && category.ageMin !== ageInt) {
+        addError(`Invalid submitted ageMin: ${ageMin}`);
+        calculatedAgeMaxDate = void 0;
+      }
+      ageMin = ageInt;
+    }
+  };
+  const processCode = (code) => {
+    const [pre, age, post] = (code.match(prePost) || []).slice(1);
+    const ageInt = parseInt(age);
+    if (pre === "U") {
+      if (category.ageMaxDate && category.ageMaxDate !== ageMaxDate) {
+        addError(`Invalid submitted ageMaxDate: ${category.ageMaxDate}`);
+      }
+      uPre(ageInt);
+    } else if (pre === "O") {
+      oPre(ageInt);
+    }
+    if (post === "U") {
+      if (category.ageMaxDate && category.ageMaxDate !== ageMaxDate) {
+        addError(`Invalid submitted ageMaxDate: ${category.ageMaxDate}`);
+      }
+      uPost(ageInt);
+    } else if (post === "O") {
+      oPost(ageInt);
+    }
+    ageMaxDate = ageMaxDate ?? calculatedAgeMaxDate;
+    ageMinDate = ageMinDate ?? calculatedAgeMinDate;
+  };
+  if (isCombined) {
+    ageMaxDate = void 0;
+    ageMinDate = void 0;
+    ageMax = void 0;
+    ageMin = void 0;
+    if (category.ageMin) {
+      const ageMaxYear = consideredYear - category.ageMin;
+      ageMaxDate = constructedDate(ageMaxYear, previousMonthDay);
+    }
+    if (category.ageMax) {
+      const ageMinYear = consideredYear - category.ageMax - 1;
+      ageMinDate = constructedDate(ageMinYear, nextMonthDay);
+    }
+    const [lowAge, highAge] = (ageCategoryCode?.match(extractCombined) ?? []).slice(1).map((n) => parseInt(n));
+    if (lowAge <= highAge) {
+      ageMin = lowAge;
+      ageMax = highAge;
+      combinedAge = true;
+    } else {
+      addError(`Invalid combined age range ${ageCategoryCode}`);
+    }
+  } else if (isBetween) {
+    ageCategoryCode?.split("-").forEach(processCode);
+  } else if (isCoded) {
+    processCode(ageCategoryCode);
+  } else {
+    if (ageMin)
+      oPre(ageMin);
+    if (ageMax)
+      uPost(ageMax);
+  }
+  if (ageMax && category.ageMin && category.ageMin > ageMax) {
+    addError(`Invalid submitted ageMin: ${category.ageMin}`);
+    ageMin = void 0;
+  }
+  const result = definedAttributes({
+    consideredDate,
+    combinedAge,
+    ageMaxDate,
+    ageMinDate,
+    ageMax,
+    ageMin
+  });
+  if (errors.length)
+    result.errors = errors;
+  return result;
+}
+
+function categoryCanContain({
+  childCategory,
+  withDetails,
+  category
+}) {
+  const categoryDetails = getCategoryAgeDetails({ category });
+  const childCategoryDetails = getCategoryAgeDetails({
+    category: childCategory
+  });
+  const invalidAgeMin = childCategoryDetails.ageMin && (categoryDetails.ageMin && childCategoryDetails.ageMin < categoryDetails.ageMin || categoryDetails.ageMax && childCategoryDetails.ageMin > categoryDetails.ageMax);
+  const invalidAgeMax = childCategoryDetails.ageMax && (categoryDetails.ageMax && childCategoryDetails.ageMax > categoryDetails.ageMax || categoryDetails.ageMin && childCategoryDetails.ageMax < categoryDetails.ageMin);
+  const invalidAgeMinDate = childCategoryDetails.ageMinDate && categoryDetails.ageMaxDate && new Date(childCategoryDetails.ageMinDate) > new Date(categoryDetails.ageMaxDate);
+  const invalidAgeMaxDate = childCategoryDetails.ageMaxDate && categoryDetails.ageMinDate && new Date(childCategoryDetails.ageMaxDate) < new Date(categoryDetails.ageMinDate);
+  const valid = !invalidAgeMax && !invalidAgeMin && !invalidAgeMinDate && !invalidAgeMaxDate;
+  const ignoreFalse = true;
+  const result = definedAttributes(
+    {
+      valid,
+      invalidAgeMax,
+      invalidAgeMin,
+      invalidAgeMinDate,
+      invalidAgeMaxDate
+    },
+    ignoreFalse
+  );
+  if (withDetails) {
+    Object.assign(result, { categoryDetails, childCategoryDetails });
+  }
+  return result;
+}
+
 const NORMAL = "normal";
 const TIMED = "timed";
 const FINAL = "final";
@@ -1424,9 +1648,7 @@ const setTypes = {
 function stringify(matchUpFormatObject, preserveRedundant) {
   if (typeof matchUpFormatObject !== "object")
     return;
-  if (matchUpFormatObject.timed && !isNaN(matchUpFormatObject.minutes))
-    return timedSetFormat(matchUpFormatObject);
-  if (matchUpFormatObject.bestOf && matchUpFormatObject.setFormat)
+  if ((matchUpFormatObject.bestOf || matchUpFormatObject.exactly) && matchUpFormatObject.setFormat)
     return getSetFormat(matchUpFormatObject, preserveRedundant);
   return void 0;
 }
@@ -1442,11 +1664,13 @@ function timedSetFormat(matchUpFormatObject) {
   return value;
 }
 function getSetFormat(matchUpFormatObject, preserveRedundant) {
-  const bestOfValue = getNumber$1(matchUpFormatObject.bestOf);
-  if (matchUpFormatObject.setFormat?.timed && matchUpFormatObject.simplified && bestOfValue === 1) {
+  const bestOfValue = getNumber$1(matchUpFormatObject.bestOf) || void 0;
+  const exactly = getNumber$1(matchUpFormatObject.exactly) || void 0;
+  const setLimit = bestOfValue || exactly;
+  if (matchUpFormatObject.setFormat?.timed && matchUpFormatObject.simplified && setLimit === 1) {
     return timedSetFormat(matchUpFormatObject.setFormat);
   }
-  const bestOfCode = bestOfValue && `${SET}${bestOfValue}` || "";
+  const setLimitCode = setLimit && `${SET}${setLimit}` || "";
   const setCountValue = stringifySet(
     matchUpFormatObject.setFormat,
     preserveRedundant
@@ -1456,11 +1680,11 @@ function getSetFormat(matchUpFormatObject, preserveRedundant) {
     matchUpFormatObject.finalSetFormat,
     preserveRedundant
   );
-  const finalSetCode = bestOfValue && bestOfValue > 1 && finalSetCountValue && setCountValue !== finalSetCountValue && // don't include final set code if equivalent to other sets
+  const finalSetCode = setLimit && setLimit > 1 && finalSetCountValue && setCountValue !== finalSetCountValue && // don't include final set code if equivalent to other sets
   `F:${finalSetCountValue}` || "";
-  const valid = bestOfCode && setCountValue;
+  const valid = setLimitCode && setCountValue;
   if (valid) {
-    return [bestOfCode, setCode, finalSetCode].filter((f) => f).join("-");
+    return [setLimitCode, setCode, finalSetCode].filter((f) => f).join("-");
   }
   return void 0;
 }
@@ -1510,7 +1734,7 @@ function parse(matchUpFormatCode) {
         setFormat,
         bestOf: 1
       };
-      if (parsedFormat.setFormat)
+      if (setFormat)
         return parsedFormat;
     }
     if (type === SET)
@@ -1520,16 +1744,23 @@ function parse(matchUpFormatCode) {
 }
 function setsMatch(formatstring) {
   const parts = formatstring.split("-");
-  const bestOf = getNumber(parts[0].slice(3));
+  const setsCount = getNumber(parts[0].slice(3));
+  const bestOf = setsCount === 1 || setsCount % 2 !== 0 ? setsCount : void 0;
+  const exactly = setsCount !== 1 && setsCount % 2 === 0 ? setsCount : void 0;
   const setFormat = parts && parseSetFormat(parts[1]);
   const finalSetFormat = parts && parseSetFormat(parts[2]);
-  const validBestOf = bestOf && bestOf < 6;
+  const timed = setFormat && setFormat.timed || finalSetFormat && finalSetFormat.timed;
+  const validSetsCount = bestOf && bestOf < 6 || timed && exactly;
   const validFinalSet = !parts[2] || finalSetFormat;
   const validSetsFormat = setFormat;
-  const result = { bestOf, setFormat };
+  const result = definedAttributes({
+    setFormat,
+    exactly,
+    bestOf
+  });
   if (finalSetFormat)
     result.finalSetFormat = finalSetFormat;
-  if (validBestOf && validSetsFormat && validFinalSet)
+  if (validSetsCount && validSetsFormat && validFinalSet)
     return result;
 }
 function parseSetFormat(formatstring) {
@@ -1719,6 +1950,7 @@ var ParticipantTypeEnum = /* @__PURE__ */ ((ParticipantTypeEnum2) => {
 })(ParticipantTypeEnum || {});
 
 function validateTieFormat(params) {
+  const checkCategory = !!(params?.enforceCategory !== false && params?.category);
   const checkGender = !!(params?.enforceGender !== false && params?.gender);
   const checkCollectionIds = params?.checkCollectionIds;
   const tieFormat = params?.tieFormat;
@@ -1755,9 +1987,11 @@ function validateTieFormat(params) {
       if ((setValue || scoreValue) && !collectionValue)
         aggregateValueImperative = true;
       const { valid: valid2, errors: collectionDefinitionErrors } = validateCollectionDefinition({
+        referenceCategory: params.category,
         referenceGender: params.gender,
         collectionDefinition,
         checkCollectionIds,
+        checkCategory,
         checkGender
       });
       if (valid2) {
@@ -1799,19 +2033,22 @@ function validateTieFormat(params) {
   return result;
 }
 function validateCollectionDefinition({
+  checkCategory = true,
   collectionDefinition,
   checkCollectionIds,
   checkGender = true,
+  referenceCategory,
   referenceGender,
   event
 }) {
   referenceGender = referenceGender ?? event?.gender;
+  const stack = "validateCollectionDefinition";
   const errors = [];
   if (typeof collectionDefinition !== "object") {
     errors.push(
       `collectionDefinition must be an object: ${collectionDefinition}`
     );
-    return { errors, error: INVALID_OBJECT };
+    return decorateResult({ result: { errors, error: INVALID_OBJECT }, stack });
   }
   const {
     collectionValueProfiles,
@@ -1824,6 +2061,7 @@ function validateCollectionDefinition({
     matchUpType,
     scoreValue,
     setValue,
+    category,
     gender
   } = collectionDefinition;
   if (checkCollectionIds && typeof collectionId !== "string") {
@@ -1869,8 +2107,23 @@ function validateCollectionDefinition({
   if (checkGender && referenceGender && gender && [GenderEnum.Male, GenderEnum.Female].includes(referenceGender) && referenceGender !== gender) {
     errors.push(`Invalid gender: ${gender}`);
   }
+  if (checkCategory && referenceCategory && category) {
+    const result = categoryCanContain({
+      category: referenceCategory,
+      childCategory: category
+    });
+    if (!result.valid)
+      return decorateResult({
+        result: { error: INVALID_CATEGORY },
+        context: result,
+        stack
+      });
+  }
   if (errors.length)
-    return { errors, error: INVALID_OBJECT };
+    return decorateResult({
+      result: { errors, error: INVALID_COLLECTION_DEFINITION },
+      stack
+    });
   return { valid: true };
 }
 function validateCollectionValueProfiles({
@@ -5236,10 +5489,10 @@ function getOrderedDrawPositions({
   const pairedDrawPositions = targetRoundProfile?.pairedDrawPositions;
   const displayOrder = pairedDrawPositions?.find(
     (pair) => overlap(pair || [], drawPositions.filter(Boolean))
-  ) || unassignedDrawPositions;
+  ) ?? unassignedDrawPositions;
   const isFeedRound = targetRoundProfile?.feedRound;
-  if (allNumeric(drawPositions)) {
-    const orderedDrawPositions = drawPositions.sort(numericSort);
+  if (allNumeric$1(drawPositions)) {
+    const orderedDrawPositions = [...drawPositions].sort(numericSort);
     return {
       orderedDrawPositions: orderedDrawPositions.length === 2 ? orderedDrawPositions : displayOrder,
       displayOrder: isFeedRound ? orderedDrawPositions : displayOrder
@@ -5962,7 +6215,7 @@ function getAllStructureMatchUps({
     matchUp,
     event: event2
   }) {
-    additionalContext = additionalContext || {};
+    additionalContext = additionalContext ?? {};
     const tieFormat = resolveTieFormat({
       drawDefinition,
       structure,
@@ -5973,7 +6226,7 @@ function getAllStructureMatchUps({
     const collectionDefinition = matchUp.collectionId && collectionDefinitions?.find(
       (definition) => definition.collectionId === matchUp.collectionId
     );
-    const matchUpFormat = matchUp.collectionId ? collectionDefinition?.matchUpFormat : matchUp.matchUpFormat || structure?.matchUpFormat || drawDefinition?.matchUpFormat || event2?.matchUpFormat;
+    const matchUpFormat = matchUp.collectionId ? collectionDefinition?.matchUpFormat : matchUp.matchUpFormat ?? structure?.matchUpFormat ?? drawDefinition?.matchUpFormat ?? event2?.matchUpFormat;
     const matchUpType = matchUp.matchUpType || collectionDefinition?.matchUpType || structure?.matchUpType || drawDefinition?.matchUpType || event2?.eventType !== TEAM$1 && event2?.eventType;
     const matchUpStatus = isCollectionBye ? BYE : matchUp.matchUpStatus;
     const { schedule, endDate } = getMatchUpScheduleDetails({
@@ -5988,7 +6241,7 @@ function getAllStructureMatchUps({
     });
     const drawPositions = tieDrawPositions ?? matchUp.drawPositions ?? [];
     const { collectionPosition, collectionId, roundPosition } = matchUp;
-    const roundNumber = matchUp.roundNumber || additionalContext.roundNumber;
+    const roundNumber = matchUp.roundNumber ?? additionalContext.roundNumber;
     const drawPositionCollectionAssignment = collectionId ? getDrawPositionCollectionAssignment({
       tournamentParticipants,
       positionAssignments,
@@ -6014,7 +6267,7 @@ function getAllStructureMatchUps({
     } : context?.category;
     const processCodes = matchUp.processCodes?.length && matchUp.processCodes || collectionDefinition?.processCodes?.length && collectionDefinition?.processCodes || structure?.processCodes?.length && structure?.processCodes || drawDefinition?.processCodes?.length && drawDefinition?.processCodes || event2?.processCodes?.length && event2?.processCodes || tournamentRecord?.processCodes;
     const competitiveProfile = contextProfile?.withCompetitiveness && getMatchUpCompetitiveProfile({ ...contextContent, matchUp });
-    const finishingPositionRange = matchUp.finishingPositionRange || additionalContext.finishingPositionRange;
+    const finishingPositionRange = matchUp.finishingPositionRange ?? additionalContext.finishingPositionRange;
     const onlyDefined = (obj) => definedAttributes(obj, void 0, true);
     const matchUpWithContext = {
       ...onlyDefined(context),
@@ -6022,7 +6275,7 @@ function getAllStructureMatchUps({
         matchUpFormat: matchUp.matchUpType === TEAM$1 ? void 0 : matchUpFormat,
         tieFormat: matchUp.matchUpType !== TEAM$1 ? void 0 : tieFormat,
         roundOfPlay: stage !== QUALIFYING && isConvertableInteger(initialRoundOfPlay2) && initialRoundOfPlay2 + (roundNumber || 0),
-        endDate: matchUp.endDate || endDate,
+        endDate: matchUp.endDate ?? endDate,
         gender: collectionDefinition?.gender,
         discipline: event2?.discipline,
         category: matchUpCategory,
@@ -6931,10 +7184,10 @@ function addUpcomingMatchUps({ drawDefinition, inContextDrawMatchUps }) {
     if (structure?.finishingPosition === WIN_RATIO) {
       const { roundNumber } = inContextMatchUp;
       const nextRoundNumber = roundNumber && ensureInt(roundNumber) + 1;
-      const matchUps = structure.matchUps || [];
+      const matchUps = structure.matchUps ?? [];
       const { roundMatchUps } = getRoundMatchUps({ matchUps });
       if (nextRoundNumber && roundMatchUps?.[nextRoundNumber]) {
-        const sidesTo = drawPositions.sort().map((drawPosition, index) => {
+        const sidesTo = [...drawPositions].sort(numericSort).map((drawPosition, index) => {
           const nextRoundMatchUp = roundMatchUps[nextRoundNumber].find(
             (matchUp) => matchUp.drawPositions?.includes(drawPosition)
           );
@@ -16895,7 +17148,8 @@ function bulkRescheduleMatchUps$1({
               scheduledTime,
               minutesChange
             );
-            newScheduledTime = scheduledTimeDate && newScheduledDate ? `${newScheduledDate}T${timeString}` : timeString;
+            const timeStringDate = scheduledTimeDate && newScheduledDate || scheduledDate === scheduledTimeDate && scheduledTimeDate;
+            newScheduledTime = timeStringDate ? `${timeStringDate}T${timeString}` : timeString;
           }
         }
         if (doNotReschedule) {