tods-competition-factory 1.8.4 → 1.8.5

package/dist/forge/query.d.ts

@@ -1634,8 +1634,9 @@ declare function isValid(matchUpFormat: string): boolean;
 type ParsedFormat = {
     finalSetFormat?: any;
     simplified?: boolean;
+    exactly?: number;
     setFormat?: any;
-    bestOf: number;
+    bestOf?: number;
 };
 declare function parse(matchUpFormatCode: string): ParsedFormat | undefined;
 

package/dist/forge/query.mjs

@@ -4558,10 +4558,10 @@ function addUpcomingMatchUps({ drawDefinition, inContextDrawMatchUps }) {
     if (structure?.finishingPosition === WIN_RATIO$1) {
       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)
           );
@@ -6137,7 +6137,7 @@ function parse(matchUpFormatCode) {
         setFormat,
         bestOf: 1
       };
-      if (parsedFormat.setFormat)
+      if (setFormat)
         return parsedFormat;
     }
     if (type === SET)
@@ -6147,16 +6147,23 @@ function parse(matchUpFormatCode) {
 }
 function setsMatch(formatstring) {
   const parts = formatstring.split("-");
-  const bestOf = getNumber$1(parts[0].slice(3));
+  const setsCount = getNumber$1(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) {
@@ -6446,10 +6453,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);
+    const orderedDrawPositions = [...drawPositions].sort(numericSort);
     return {
       orderedDrawPositions: orderedDrawPositions.length === 2 ? orderedDrawPositions : displayOrder,
       displayOrder: isFeedRound ? orderedDrawPositions : displayOrder
@@ -7173,7 +7180,7 @@ function getAllStructureMatchUps({
     matchUp,
     event: event2
   }) {
-    additionalContext = additionalContext || {};
+    additionalContext = additionalContext ?? {};
     const tieFormat = resolveTieFormat({
       drawDefinition,
       structure,
@@ -7184,7 +7191,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 && event2?.eventType;
     const matchUpStatus = isCollectionBye ? BYE : matchUp.matchUpStatus;
     const { schedule, endDate } = getMatchUpScheduleDetails({
@@ -7199,7 +7206,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,
@@ -7225,7 +7232,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),
@@ -7233,7 +7240,7 @@ function getAllStructureMatchUps({
         matchUpFormat: matchUp.matchUpType === TEAM ? void 0 : matchUpFormat,
         tieFormat: matchUp.matchUpType !== TEAM ? 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,
@@ -8338,9 +8345,7 @@ function getEligibleVoluntaryConsolationParticipants({
 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;
 }
@@ -8356,11 +8361,13 @@ function timedSetFormat(matchUpFormatObject) {
   return value;
 }
 function getSetFormat(matchUpFormatObject, preserveRedundant) {
-  const bestOfValue = getNumber(matchUpFormatObject.bestOf);
-  if (matchUpFormatObject.setFormat?.timed && matchUpFormatObject.simplified && bestOfValue === 1) {
+  const bestOfValue = getNumber(matchUpFormatObject.bestOf) || void 0;
+  const exactly = getNumber(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
@@ -8370,11 +8377,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;
 }