tods-competition-factory 2.2.47 → 2.2.49

package/dist/tods-competition-factory.d.ts

@@ -5739,6 +5739,7 @@ declare function bulkMatchUpStatusUpdate(params: any): ResultType | {
         message: string;
         code: string;
     };
+    info?: undefined;
 } | {
     error: {
         message: string;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.2.47';
+    return '2.2.49';
 }
 
 const SINGLES_MATCHUP = 'SINGLES';
@@ -2256,7 +2256,7 @@ function isValidMatchUpFormat({ matchUpFormat }) {
     const preserveRedundant = !!((setParts && tiebreakTo && setsTo === tiebreakAt) ||
         (finalSetParts && finalSetTiebreakTo && finalSetTo === finalTiebreakAt));
     const stringified = stringify(parsedFormat, preserveRedundant);
-    return stringified === matchUpFormat;
+    return stringified === matchUpFormat.replace(/G/, '');
 }
 
 const validDateString = /^[\d]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][\d]|3[0-1])$/;
@@ -32384,12 +32384,10 @@ function validateSetScore(set, matchUpFormat, isDecidingSet, allowIncomplete) {
             if (side1Score === 0 && side2Score === 0) {
                 return { isValid: false, error: 'Timed set requires at least one side to have scored' };
             }
-            if (setFormat.based === 'P') {
-                if (side1Score === side2Score && side1Score > 0 && setFormat.tiebreakFormat) {
-                    const hasTiebreak = set.side1TiebreakScore !== undefined || set.side2TiebreakScore !== undefined;
-                    if (!hasTiebreak) {
-                        return { isValid: false, error: 'Tied timed set requires tiebreak' };
-                    }
+            if (setFormat.based === 'P' && side1Score === side2Score && side1Score > 0 && setFormat.tiebreakFormat) {
+                const hasTiebreak = set.side1TiebreakScore !== undefined || set.side2TiebreakScore !== undefined;
+                if (!hasTiebreak) {
+                    return { isValid: false, error: 'Tied timed set requires tiebreak' };
                 }
             }
         }
@@ -47346,7 +47344,7 @@ function generateScoreForWinnerOrder(neutralParsedSets, inferredWinningSide, mat
     };
 }
 function generateOutcomeFromScoreString(params) {
-    const { matchUpFormat, matchUpStatus, winningSide, scoreString, setTBlast } = params;
+    const { matchUpFormat, matchUpStatus, winningSide, scoreString, setTBlast, preserveSideOrder = false } = params;
     if (!scoreString)
         return {
             outcome: {
@@ -47362,7 +47360,7 @@ function generateOutcomeFromScoreString(params) {
     const inferredWinningSide = inferWinningSide(winningSide, matchUpFormat, neutralParsedSets);
     const parsedFormat = parse(matchUpFormat);
     const isAggregateScoring = parsedFormat?.setFormat?.based === 'A' || parsedFormat?.finalSetFormat?.based === 'A';
-    const score = isBracketNotation || isAggregateScoring
+    const score = preserveSideOrder || isBracketNotation || isAggregateScoring
         ? generateScoreForSideOrder(scoreString, matchUpFormat, setTBlast)
         : generateScoreForWinnerOrder(neutralParsedSets, inferredWinningSide, matchUpFormat, setTBlast);
     return definedAttributes({
@@ -52051,8 +52049,7 @@ function processLeagueProfiles(params) {
                 homeVenueIds,
             };
             homeVenueIds.forEach((venueId) => !venueIds.includes(venueId) && venueIds.push(venueId));
-            allUniqueParticipantIds.push(...individualParticipantIds);
-            allUniqueParticipantIds.push(teamParticipantId);
+            allUniqueParticipantIds.push(...individualParticipantIds, teamParticipantId);
             const result = addParticipants({
                 participants: [teamParticipant, ...participants],
                 tournamentRecord,
@@ -55533,12 +55530,12 @@ function proConflicts({ tournamentRecords, matchUps, }) {
         const sourceMatchUpIds = deps[matchUpId].matchUpIds;
         sourceMatchUpIds.length && profile.sourceMatchUpIds.push(...sourceMatchUpIds);
         const matchUpParticipantIds = sides
-            ?.map((side) => [side.participant?.individualParticipantIds, side.participantId])
+            ?.flatMap((side) => [side.participant?.individualParticipantIds, side.participantId])
             .flat()
             .filter(Boolean) ?? [];
         const potentialMatchUpParticipantIds = potentialParticipants
             ?.flat()
-            .map(({ individualParticipantIds, participantId }) => [individualParticipantIds, participantId])
+            .flatMap(({ individualParticipantIds, participantId }) => [individualParticipantIds, participantId])
             .flat()
             .filter(Boolean) || [];
         profile.participantIds.push(...potentialMatchUpParticipantIds, ...matchUpParticipantIds);
@@ -55553,6 +55550,41 @@ function proConflicts({ tournamentRecords, matchUps, }) {
     }));
     const sourceDistance = (a, b) => deps[a].sources.reduce((distance, round, index) => (round.includes(b) && index + 1) || distance, 0);
     const rowIssues = rowProfiles.map(() => []);
+    const addWarningToMatchUp = (matchUpId, warnedMatchUpIds, participantConflicts) => {
+        if (!participantConflicts[matchUpId])
+            participantConflicts[matchUpId] = {};
+        if (!participantConflicts[matchUpId][SCHEDULE_WARNING]) {
+            participantConflicts[matchUpId][SCHEDULE_WARNING] = warnedMatchUpIds.filter((id) => id !== matchUpId);
+        }
+    };
+    const processParticipantWarnings = (previousRow, row, participantConflicts) => {
+        const previousRowWarnings = row.participantIds.filter((id) => previousRow.participantIds.includes(id));
+        previousRowWarnings.forEach((participantId) => {
+            const warnedMatchUpIds = row.matchUpIds
+                .concat(previousRow.matchUpIds)
+                .filter((matchUpId) => deps[matchUpId].participantIds.includes(participantId));
+            warnedMatchUpIds.forEach((matchUpId) => {
+                addWarningToMatchUp(matchUpId, warnedMatchUpIds, participantConflicts);
+            });
+        });
+    };
+    const addConflictToMatchUp = (matchUpId, conflictedMatchUpIds, participantConflicts) => {
+        if (!participantConflicts[matchUpId])
+            participantConflicts[matchUpId] = {};
+        if (!participantConflicts[matchUpId][SCHEDULE_CONFLICT]) {
+            participantConflicts[matchUpId][SCHEDULE_CONFLICT] = conflictedMatchUpIds.filter((id) => id !== matchUpId);
+        }
+    };
+    const processParticipantConflicts = (row) => {
+        const participantConflicts = {};
+        const instances = instanceCount(row.participantIds);
+        const conflictedParticipantIds = new Set(Object.keys(instances).filter((key) => instances[key] > 1));
+        const conflictedMatchUpIds = row.matchUpIds.filter((matchUpId) => deps[matchUpId].participantIds.some((id) => conflictedParticipantIds.has(id)));
+        conflictedMatchUpIds.forEach((matchUpId) => {
+            addConflictToMatchUp(matchUpId, conflictedMatchUpIds, participantConflicts);
+        });
+        return participantConflicts;
+    };
     const annotate = (matchUpId, issue, issueType, issueIds) => {
         if (!mappedMatchUps[matchUpId].schedule[SCHEDULE_STATE]) {
             mappedMatchUps[matchUpId].schedule[SCHEDULE_STATE] = issue;
@@ -55572,31 +55604,9 @@ function proConflicts({ tournamentRecords, matchUps, }) {
     rowProfiles.forEach((row, rowIndex) => {
         const previousRow = rowIndex ? rowProfiles[rowIndex - 1] : undefined;
         const subsequentRows = rowProfiles.slice(rowIndex + 1);
-        const participantConflicts = {};
-        const instances = instanceCount(row.participantIds);
-        const conflictedParticipantIds = Object.keys(instances).filter((key) => instances[key] > 1);
-        const conflictedMatchUpIds = row.matchUpIds.filter((matchUpId) => deps[matchUpId].participantIds.some((id) => conflictedParticipantIds.includes(id)));
-        conflictedMatchUpIds.forEach((matchUpId) => {
-            if (!participantConflicts[matchUpId])
-                participantConflicts[matchUpId] = {};
-            if (!participantConflicts[matchUpId][SCHEDULE_CONFLICT]) {
-                participantConflicts[matchUpId][SCHEDULE_CONFLICT] = conflictedMatchUpIds.filter((id) => id !== matchUpId);
-            }
-        });
-        const previousRowWarnings = previousRow && row.participantIds.filter((id) => previousRow.participantIds.includes(id));
-        if (previousRowWarnings) {
-            previousRowWarnings.forEach((participantId) => {
-                const warnedMatchUpIds = row.matchUpIds
-                    .concat(previousRow.matchUpIds)
-                    .filter((matchUpId) => deps[matchUpId].participantIds.includes(participantId));
-                warnedMatchUpIds.forEach((matchUpId) => {
-                    if (!participantConflicts[matchUpId])
-                        participantConflicts[matchUpId] = {};
-                    if (!participantConflicts[matchUpId][SCHEDULE_WARNING]) {
-                        participantConflicts[matchUpId][SCHEDULE_WARNING] = warnedMatchUpIds.filter((id) => id !== matchUpId);
-                    }
-                });
-            });
+        const participantConflicts = processParticipantConflicts(row);
+        if (previousRow) {
+            processParticipantWarnings(previousRow, row, participantConflicts);
         }
         row.matchUpIds.forEach((matchUpId) => {
             const sourceMatchUpIds = deps[matchUpId].matchUpIds;