tods-competition-factory 2.1.5 → 2.1.6

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.1.5';
+    return '2.1.6';
 }
 
 function isFunction(obj) {
@@ -10439,7 +10439,7 @@ const logColors = {
 
 const globalLog = [];
 function pushGlobalLog(value, devContextOverride) {
-    if (typeof value === 'string')
+    if (isString(value))
         value = { method: value };
     if (devContextOverride || getDevContext())
         globalLog.push(value);
@@ -40222,12 +40222,11 @@ function generateStatCrew(params) {
     if (paramsCheck.error)
         return paramsCheck;
     const { tournamentRecord } = params;
-    const { startDate, tournamentId } = tournamentRecord;
+    const { startDate, tournamentId, tournamentName } = tournamentRecord;
     const teamParticipants = tournamentRecord.participants.filter((participant) => participant.participantType === TEAM);
     const homeTeam = teamParticipants?.find((team) => team.participantRoleResponsibilities?.includes('Home'));
     const awayTeams = teamParticipants?.filter((team) => team.participantId !== homeTeam?.participantId);
     const date = formatDate(startDate, '/', 'MDY');
-    const neutralGame = !homeTeam ? 'Y' : 'N';
     const homename = homeTeam?.participantName || awayTeams?.[1]?.participantName;
     const homeid = homeTeam?.participantId || awayTeams?.[1]?.participantId;
     const visname = awayTeams?.[0]?.participantName;
@@ -40243,26 +40242,47 @@ function generateStatCrew(params) {
         const tieValue = sideNumber === 1 ? side1TiebreakScore : side2TiebreakScore;
         return { [setKey]: setValue, [tbKey]: tieValue };
     }) ?? []));
-    const getParticipantAttibutes = ({ matchUpId, participant }) => {
-        const name = !participant.individualParticipants ? participant.participantName : undefined;
+    const getParticipantAttibutes = ({ participant }) => {
+        const pair = participant.individualParticipants?.length === 2;
+        const pairTeamParticipantIds = pair
+            ? unique(participant.individualParticipants?.map((p) => p.teams?.[0]?.participantId))
+            : [];
+        const pairTeamIds = pair ? unique(participant.individualParticipants?.map((p) => p.teams?.[0]?.teamId)) : [];
+        const teamParticipantId = (!pair && participant.teams?.[0]?.participantId) ||
+            (pairTeamParticipantIds?.length === 1 && pairTeamParticipantIds[0]) ||
+            undefined;
+        const team = (!pair && participant.teams?.[0]?.teamId) || (pairTeamIds?.length === 1 && pairTeamIds[0]) || teamParticipantId;
+        const name = !pair ? participant.participantName : undefined;
         const name_1 = participant.individualParticipants?.[0]?.participantName;
         const name_2 = participant.individualParticipants?.[1]?.participantName;
-        const vh = matchUpId === homeid ? 'H' : 'V';
-        return definedAttributes({ vh, name, name_1, name_2 });
+        const vh = (homeid && (teamParticipantId === homeid ? 'H' : 'V')) || '';
+        return definedAttributes({ vh, team, name, name_1, name_2 });
     };
     const mapMatchUp = (matchUp) => {
-        const { collectionPosition: match, orderOfFinish: order, matchUpId, matchUpType, sides } = matchUp;
+        const { collectionPosition: match, orderOfFinish: order, matchUpType, sides } = matchUp;
         const childArray = sides?.map((side) => {
             const { sideNumber, participant } = side;
             const scoreAttributes = getScoreAttributes({ sets: matchUp.score?.sets, sideNumber });
             const scoreType = matchUpType === SINGLES ? 'singles_score' : 'doubles_score';
-            return { [scoreType]: { ...getParticipantAttibutes({ matchUpId, participant }), ...scoreAttributes } };
+            return { [scoreType]: { ...getParticipantAttibutes({ participant }), ...scoreAttributes } };
         });
         const matchType = matchUpType === SINGLES ? 'singles_match' : 'doubles_match';
         return { [matchType]: { match, order, childArray } };
     };
     const json = {
-        venue: { gameid: tournamentId, date, neutralGame, homeid, homename, visid, visname, officials: {}, rules: {} },
+        venue: {
+            tournament: teamParticipants?.length > 2 ? 'Y' : 'N',
+            neutralgame: !homeTeam ? 'Y' : 'N',
+            tournamentname: tournamentName,
+            gameid: tournamentId,
+            officials: {},
+            rules: {},
+            homename,
+            visname,
+            homeid,
+            visid,
+            date,
+        },
         singles_matches: singles?.map(mapMatchUp),
         doubles_matches: doubles?.map(mapMatchUp),
     };
@@ -42326,7 +42346,13 @@ function removeDirectedLoser({ sourceMatchUpStatus, loserParticipantId, tourname
 }
 function removeDirectedBye({ inContextDrawMatchUps, tournamentRecord, drawDefinition, drawPosition, matchUpsMap, targetLink, event, }) {
     const structureId = targetLink.target.structureId;
-    clearDrawPosition({
+    const stack = 'removeDirectedBye';
+    pushGlobalLog({
+        color: 'brightyellow',
+        method: stack,
+        drawPosition,
+    });
+    const result = clearDrawPosition({
         inContextDrawMatchUps,
         tournamentRecord,
         drawDefinition,
@@ -42335,7 +42361,7 @@ function removeDirectedBye({ inContextDrawMatchUps, tournamentRecord, drawDefini
         structureId,
         event,
     });
-    return { ...SUCCESS };
+    return decorateResult({ result, stack });
 }
 
 function lastSetFormatIsTimed(inContextMatchUp) {
@@ -42979,24 +43005,27 @@ const keyColors = {
 };
 function removeDoubleExit(params) {
     const { inContextDrawMatchUps, appliedPolicies, drawDefinition, matchUpsMap, targetData, matchUp } = params;
+    const { matchUpId } = matchUp;
     let { iteration = 0 } = params;
     iteration += 1;
     const stack = 'removeDoubleExit';
     pushGlobalLog({
-        method: stack,
         color: 'brightyellow',
+        method: stack,
+        matchUpId,
         iteration,
         keyColors,
     });
-    const { targetLinks: { loserTargetLink }, targetMatchUps: { loserMatchUp, winnerMatchUp, loserTargetDrawPosition }, } = targetData;
+    const { targetMatchUps: { loserMatchUp, winnerMatchUp, loserTargetDrawPosition }, targetLinks: { loserTargetLink }, } = targetData;
     if (winnerMatchUp && winnerMatchUp.matchUpStatus !== BYE) {
-        const { stage, roundNumber, roundPosition } = winnerMatchUp;
+        const { stage, roundNumber, roundPosition, structureName } = winnerMatchUp;
         pushGlobalLog({
             winner: 'winner',
-            stage,
-            roundNumber,
             roundPosition,
+            structureName,
+            roundNumber,
             keyColors,
+            stage,
         });
         conditionallyRemoveDrawPosition({
             ...params,
@@ -43005,22 +43034,24 @@ function removeDoubleExit(params) {
             iteration,
         });
     }
-    if (loserMatchUp && loserMatchUp.matchUpStatus !== BYE) {
+    const byePropagatedToLoserMatchUp = loserMatchUp?.matchUpStatus === BYE && (loserMatchUp?.feedRound || loserMatchUp?.roundNumber === 1);
+    if (loserMatchUp && (loserMatchUp.matchUpStatus !== BYE || byePropagatedToLoserMatchUp)) {
         const inContextLoserMatchUp = inContextDrawMatchUps.find(({ matchUpId }) => matchUpId === loserMatchUp.matchUpId);
         const { structure: loserStructure } = findStructure({
             drawDefinition,
             structureId: inContextLoserMatchUp.structureId,
         });
-        const { stage, roundNumber, roundPosition, feedRound } = loserMatchUp;
+        const { stage, roundNumber, roundPosition, feedRound, structureName } = loserMatchUp;
         pushGlobalLog({
             loser: 'loser',
-            stage,
-            roundNumber,
             roundPosition,
+            structureName,
+            roundNumber,
             keyColors,
             feedRound,
+            stage,
         });
-        if (appliedPolicies?.progression?.doubleExitPropagateBye) {
+        if (appliedPolicies?.progression?.doubleExitPropagateBye || byePropagatedToLoserMatchUp) {
             removeDirectedBye({
                 drawPosition: loserTargetDrawPosition,
                 targetLink: loserTargetLink,
@@ -43032,8 +43063,8 @@ function removeDoubleExit(params) {
         else {
             const result = conditionallyRemoveDrawPosition({
                 ...params,
-                structure: loserStructure,
                 targetMatchUp: loserMatchUp,
+                structure: loserStructure,
                 iteration,
             });
             if (result.error)
@@ -43045,7 +43076,7 @@ function removeDoubleExit(params) {
 function conditionallyRemoveDrawPosition(params) {
     const { inContextDrawMatchUps, appliedPolicies, drawDefinition, sourceMatchUp, targetMatchUp, matchUpsMap, structure, iteration, } = params;
     const stack = 'conditionallyRemoveDrawPosition';
-    pushGlobalLog({ method: stack });
+    pushGlobalLog({ method: stack, structureName: structure?.structureName, iteration });
     const nextTargetData = positionTargets({
         matchUpId: targetMatchUp.matchUpId,
         inContextDrawMatchUps,
@@ -43085,15 +43116,16 @@ function conditionallyRemoveDrawPosition(params) {
         }
     }
     if (nextWinnerMatchUp && drawPositionToRemove) {
-        const { stage, roundNumber, roundPosition } = nextWinnerMatchUp;
+        const { stage, roundNumber, roundPosition, structureName } = nextWinnerMatchUp;
         pushGlobalLog({
             method: 'removeDirectedWinner',
             drawPositionToRemove,
-            keyColors,
             color: 'brightgreen',
-            stage,
-            roundNumber,
             roundPosition,
+            structureName,
+            roundNumber,
+            keyColors,
+            stage,
         });
         removeDirectedWinner({
             winningDrawPosition: drawPositionToRemove,