tods-competition-factory 1.8.22 → 1.8.24

package/README.md

@@ -39,7 +39,7 @@ By default a deep copy of documents are made as they are loaded into each state
 ## Other Utilities
 
 1. [**mocksEngine**](./overview/mocks-engine-overview) - generates complete tournament objects, or tournamentRecords, as well as mock persons, participants and matchUp outcomes.
-   It is used extensively in the ~1850 tests that are run against the factory methods before every package release.
+   It is used extensively in the ~1900 tests that are run against the factory methods before every package release.
 2. [**scoreGovernor**](./scoreGovernor) - is a collection of scoring related utilities which provide analysis/validation or generate values, but do not make any mutations.
 3. [**matchUpFormatCode**](./codes/matchup-format) - is an ITF matchUp format code parser, stringifier, and validator.
 4. [**ageCategoryCode**](./codes/age-category) - is an ITF ageCategoryCode parser.

package/dist/forge/generate.mjs

@@ -2071,7 +2071,7 @@ function findVenue({
   if (!venue && tournamentRecords) {
     const linkedTournamentIds = getLinkedTournamentIds({
       tournamentRecords
-    }).linkedTournamentIds || [];
+    }).linkedTournamentIds ?? [];
     const relevantIds = linkedTournamentIds[tournamentRecord.tournamentId];
     for (const tournamentId of relevantIds) {
       const record = tournamentRecords[tournamentId];
@@ -2630,7 +2630,7 @@ function getPairedParticipant({
       result: { error: MISSING_PARTICIPANT_IDS },
       stack
     });
-  tournamentParticipants = tournamentParticipants || tournamentRecord?.participants || [];
+  tournamentParticipants = tournamentParticipants ?? tournamentRecord?.participants ?? [];
   const existingPairedParticipants = tournamentParticipants.filter(
     (participant) => participant.participantType === PAIR && intersection(participantIds, participant.individualParticipantIds).length === participantIds.length && participant.individualParticipantIds.length === participantIds.length
   );
@@ -4305,7 +4305,8 @@ const POLICY_ROUND_NAMING_DEFAULT = {
   [POLICY_TYPE_ROUND_NAMING]: {
     policyName: "Round Naming Default",
     namingConventions: {
-      round: "Round"
+      round: "Round",
+      pre: "Pre"
     },
     qualifyingFinishMap: {
       1: "Final"
@@ -4349,12 +4350,11 @@ function getRoundContextProfile({
   const roundNamingProfile = {};
   const defaultRoundNamingPolicy = POLICY_ROUND_NAMING_DEFAULT[POLICY_TYPE_ROUND_NAMING];
   const isQualifying = structure.stage === QUALIFYING;
-  const qualifyingFinishgMap = isQualifying && (roundNamingPolicy?.qualifyingFinishMap || defaultRoundNamingPolicy?.qualifyingFinishMap || {});
   const qualifyingStageSequences = isQualifying ? Math.max(
     ...(drawDefinition?.structures ?? []).filter((structure2) => structure2.stage === QUALIFYING).map(({ stageSequence }) => stageSequence ?? 1),
     0
   ) : 0;
-  const preQualifyingSequence = qualifyingStageSequences ? qualifyingStageSequences - (structure.stageSequence || 1) || "" : "";
+  const preQualifyingSequence = (structure.stageSequence ?? 1) < qualifyingStageSequences ? structure.stageSequence ?? 1 : "";
   const preQualifyingAffix = preQualifyingSequence ? roundNamingPolicy?.affixes?.preQualifying || defaultRoundNamingPolicy.affixes.preQualifying || "" : "";
   const roundNamingMap = roundNamingPolicy?.roundNamingMap || defaultRoundNamingPolicy.roundNamingMap || {};
   const abbreviatedRoundNamingMap = roundNamingPolicy?.abbreviatedRoundNamingMap || defaultRoundNamingPolicy.abbreviatedRoundNamingMap || {};
@@ -4378,6 +4378,7 @@ function getRoundContextProfile({
       })
     );
   } else {
+    const qualifyingFinishgMap = isQualifying && (roundNamingPolicy?.qualifyingFinishMap || defaultRoundNamingPolicy?.qualifyingFinishMap || {});
     Object.assign(
       roundNamingProfile,
       ...roundProfileKeys.map((round) => {
@@ -4652,7 +4653,13 @@ function getAllStructureMatchUps({
       matchUps
     }));
   }
-  return { matchUps, roundMatchUps, roundProfile, collectionPositionMatchUps };
+  return {
+    collectionPositionMatchUps,
+    roundMatchUps,
+    roundProfile,
+    matchUpsMap,
+    matchUps
+  };
   function addMatchUpContext({
     scheduleVisibilityFilters: scheduleVisibilityFilters2,
     sourceDrawPositionRanges,
@@ -9198,7 +9205,7 @@ function getContainedStructures({
   const containerStructures = {};
   const structureContainers = drawDefinitions.map((dd) => dd?.structures?.filter((structure) => structure?.structures)).flat().filter(Boolean);
   for (const structureContainer of structureContainers) {
-    const { structures, structureId } = structureContainer || {};
+    const { structures, structureId } = structureContainer ?? {};
     structures && structureId && (containedStructures[structureId] = structures?.map(
       (structure) => structure.structureId
     )) && structures.forEach(
@@ -13214,7 +13221,10 @@ function automatedPositioning$1({
   return { positionAssignments, conflicts, ...SUCCESS, positioningReport };
 }
 
-function getPlayoffStructures({ drawDefinition, structureId }) {
+function getPlayoffStructures({
+  drawDefinition,
+  structureId
+}) {
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
   const { structure } = findStructure({ drawDefinition, structureId });
@@ -13333,6 +13343,7 @@ function automatedPlayoffPositioning(params) {
 
 function getStructureRoundProfile({
   drawDefinition,
+  matchUpsMap,
   structureId
 }) {
   const result = findStructure({
@@ -13340,9 +13351,12 @@ function getStructureRoundProfile({
     structureId
   });
   if (result.error)
-    return result;
-  const { matchUps } = getAllStructureMatchUps({ structure: result.structure });
-  return getRoundMatchUps({ matchUps });
+    return decorateResult({ result });
+  const { matchUps } = getAllStructureMatchUps({
+    structure: result.structure,
+    matchUpsMap
+  });
+  return { ...getRoundMatchUps({ matchUps }), matchUps, matchUpsMap };
 }
 
 function getFinishingPositionSourceRoundsMap({
@@ -13393,16 +13407,18 @@ function roundValueRanges(values) {
 
 function getPositionsPlayedOff({
   drawDefinition,
-  structureIds
+  structureIds,
+  matchUpsMap
 }) {
   if (structureIds && !Array.isArray(structureIds))
     return { error: INVALID_VALUES, context: { structureIds } };
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
-  structureIds = structureIds || (drawDefinition.structures || []).filter((structure) => structure.stage !== QUALIFYING).map(({ structureId }) => structureId);
+  structureIds = structureIds ?? (drawDefinition.structures ?? []).filter((structure) => structure.stage !== QUALIFYING).map(({ structureId }) => structureId);
   const allFinishingPositionRanges = structureIds.map((structureId) => {
     const { roundProfile } = getStructureRoundProfile({
       drawDefinition,
+      matchUpsMap,
       structureId
     });
     const values = roundProfile && Object.values(roundProfile);
@@ -13497,18 +13513,19 @@ function getPlayoffRoundsRanges({ playoffSourceRounds, roundProfile }) {
 function getAvailablePlayoffProfiles({ drawDefinition, structureId }) {
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
-  const { positionsNotPlayedOff, positionsPlayedOff } = getPositionsPlayedOff({
+  const { matchUps, matchUpsMap } = allDrawMatchUps({
+    inContext: true,
     drawDefinition
   });
+  const { positionsNotPlayedOff, positionsPlayedOff } = getPositionsPlayedOff({
+    drawDefinition,
+    matchUpsMap
+  });
   const { structures } = getDrawStructures({ drawDefinition });
   const filteredStructures = structures.filter(
     (structure) => !structureId && structure.stage !== VOLUNTARY_CONSOLATION || structure.structureId === structureId
   );
   const available = {};
-  const matchUps = allDrawMatchUps({
-    inContext: true,
-    drawDefinition
-  }).matchUps;
   for (const structure of filteredStructures) {
     const structureId2 = structure?.structureId;
     const result = availablePlayoffProfiles({
@@ -13982,7 +13999,7 @@ function treeMatchUps({
     uuids
   }));
   roundNumber++;
-  roundLimit = roundLimit || qualifyingRoundNumber;
+  roundLimit = roundLimit ?? qualifyingRoundNumber;
   while (roundNodes.length > 1) {
     if (qualifyingPositions && roundNodes.length === qualifyingPositions) {
       roundLimit = roundNumber - 1;
@@ -14010,7 +14027,7 @@ function treeMatchUps({
     roundLimit = roundNumber - 1;
   } else {
     matchUps = matchUps.filter(
-      (matchUp) => roundLimit && (matchUp.roundNumber || 0) <= roundLimit
+      (matchUp) => roundLimit && (matchUp.roundNumber ?? 0) <= roundLimit
     );
   }
   return { drawSize, matchUps, roundsCount, roundLimit };
@@ -15506,18 +15523,17 @@ function getTallyReport({ matchUps, order, report }) {
         readable.push(excluded);
       } else {
         const floatSort = (a, b) => parseFloat(step.reversed ? a : b) - parseFloat(step.reversed ? b : a);
+        const participantsCount = step.groups ? Object.values(step.groups).flat(Infinity).length : step.participantIds?.length ?? 0;
         const getExplanation = (step2) => {
-          Object.keys(step2.groups).sort(floatSort).forEach((key) => {
+          step2.groups && Object.keys(step2.groups).sort(floatSort).forEach((key) => {
             const participantNames = step2.groups[key].map((participantId) => participants[participantId]).join(", ");
             const explanation = `${key} ${step2.attribute}: ${participantNames}`;
             readable.push(explanation);
           });
         };
         const reversed = step.reversed ? " in reverse order" : "";
-        const participantsCount = Object.values(step.groups).flat(
-          Infinity
-        ).length;
-        const description = `Step ${i + 1}: ${participantsCount} particiants were grouped${reversed} by ${step.attribute}`;
+        const action = step.groups ? "grouped" : "separated";
+        const description = `Step ${i + 1}: ${participantsCount} particiants were ${action}${reversed} by ${step.attribute}`;
         readable.push(description);
         if (step.idsFilter) {
           const note = `${step.attribute} was calculated considering ONLY TIED PARTICIPANTS`;
@@ -15533,7 +15549,7 @@ function getTallyReport({ matchUps, order, report }) {
     const { participantId, resolved } = orderEntry;
     const pOrder = orderEntry.groupOrder || orderEntry.provisionalOrder;
     readable.push(
-      `${pOrder}: ${participants[participantId]} => resolved: ${resolved}`
+      `${pOrder}: ${participants[participantId]} => resolved: ${!!resolved}`
     );
   });
   return readable.join("\r\n");
@@ -15622,7 +15638,7 @@ function getGroupOrder(params) {
   report.push({ attribute, groups: orderedTallyGroups });
   const groupOrder = Object.keys(orderedTallyGroups).map((key) => parseFloat(key)).sort((a, b) => b - a).map((key) => orderedTallyGroups[key]).map((participantIds) => {
     const result = groupSubSort({ participantIds, ...params });
-    report.push(result.report);
+    report.push(...result.report || []);
     return result.order;
   }).flat(Infinity);
   let groupPosition = 1;
@@ -15714,7 +15730,7 @@ function processAttribute({
         tallyPolicy,
         matchUps
       });
-      report.push(result.report);
+      report.push(...result.report || []);
       return result.order;
     }).flat(Infinity);
   }
@@ -15728,6 +15744,9 @@ function groupSubSort({
   tallyPolicy,
   matchUps
 }) {
+  const excludedDirectives = [];
+  const report = [];
+  let result;
   if (participantIds?.length === 1) {
     const participantId = participantIds[0];
     return {
@@ -15736,13 +15755,13 @@ function groupSubSort({
   }
   if (participantIds?.length === 2 && (!tallyPolicy?.headToHead || !tallyPolicy.headToHead.disabled && !disableHeadToHead)) {
     const result2 = headToHeadWinner({ participantIds, participantResults });
-    if (result2)
-      return { order: [result2], headToHeadWinner: result2[0].participantId };
+    if (result2) {
+      const headToHeadWinner2 = result2[0].participantId;
+      report.push({ attribute: "head2Head", participantIds, headToHeadWinner: headToHeadWinner2 });
+      return { order: [result2], headToHeadWinner: headToHeadWinner2, report };
+    }
   }
   const directives = tallyPolicy?.tallyDirectives || headToHeadTallyDirectives;
-  const excludedDirectives = [];
-  const report = [];
-  let result;
   const filteredDirectives = directives.filter((directive) => {
     const keepDirective = isNumeric(directive.maxParticipants) && participantIds?.length > directive.maxParticipants ? false : true;
     if (!keepDirective)
@@ -16106,8 +16125,10 @@ function modifyMatchUpScore({
         const matchUpFilters = isDualMatchUp ? { matchUpTypes: [TEAM$2] } : void 0;
         const { matchUps } = getAllStructureMatchUps({
           afterRecoveryTimes: false,
+          tournamentRecord,
           inContext: true,
           matchUpFilters,
+          drawDefinition,
           structure: structure2,
           event
         });
@@ -19096,7 +19117,7 @@ function filterParticipants({
       );
       if (event.eventType === SINGLES)
         return enteredParticipantIds;
-      const individualParticipantIds = (tournamentRecord?.participants || []).filter(
+      const individualParticipantIds = (tournamentRecord?.participants ?? []).filter(
         (participant) => enteredParticipantIds.includes(participant.participantId)
       ).map((participant) => participant.individualParticipantIds).flat(1);
       return enteredParticipantIds.concat(...individualParticipantIds);
@@ -20695,7 +20716,6 @@ function generateQualifyingStructures({
       roundTarget,
       linkType
     });
-    targetRoundQualifiersCount = 0;
     roundTarget += 1;
   }
   return {
@@ -23000,7 +23020,7 @@ function getScaledEntries({
 }) {
   if (!tournamentRecord)
     return { error: MISSING_TOURNAMENT_RECORD };
-  entries = entries || event?.entries || [];
+  entries = entries ?? event?.entries ?? [];
   const stageEntries = entries.filter(
     (entry) => (!stage || !entry.entryStage || entry.entryStage === stage) && (!stageSequence || !entry.entryStageSequence || entry.entryStageSequence === stageSequence) && STRUCTURE_SELECTED_STATUSES.includes(entry.entryStatus)
   );
@@ -23871,7 +23891,7 @@ function generateFlightProfile(params) {
   } = params;
   if (!event)
     return { error: MISSING_EVENT };
-  const eventEntries = event.entries || [];
+  const eventEntries = event.entries ?? [];
   const { flightProfile } = getFlightProfile({ event });
   if (flightProfile && attachFlightProfile$1 && !deleteExisting) {
     return { error: EXISTING_PROFILE };
@@ -23920,7 +23940,7 @@ function generateFlightProfile(params) {
     const flightNumber = index + 1;
     return {
       flightNumber,
-      drawId: uuids?.pop() || UUID(),
+      drawId: uuids?.pop() ?? UUID(),
       drawEntries: getDrawEntries(splitEntries[index]),
       drawName: drawNames?.length && drawNames[index] || `${drawNameRoot} ${flightNumber}`
     };