tods-competition-factory 1.8.23 → 1.8.25

package/dist/forge/transform.d.ts

@@ -1531,7 +1531,7 @@ type AddFinishingRoundsArgs = {
 };
 declare function addFinishingRounds({ finishingPositionOffset, finishingPositionLimit, positionsFed, roundsCount, roundLimit, matchUps, lucky, fmlc, }: AddFinishingRoundsArgs): MatchUp[];
 
-declare function structureSort(a: Structure, b: Structure, config?: any): number;
+declare function structureSort(a: Structure | undefined, b: Structure | undefined, config?: any): number;
 
 /**
  * Sorting function to arrange matchUps by stage, stageSequence, roundNumber, roundPosition (where applicable)

package/dist/forge/transform.mjs

@@ -2892,18 +2892,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`;
@@ -2919,7 +2918,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");
@@ -3008,7 +3007,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;
@@ -3100,7 +3099,7 @@ function processAttribute({
         tallyPolicy,
         matchUps
       });
-      report.push(result.report);
+      report.push(...result.report || []);
       return result.order;
     }).flat(Infinity);
   }
@@ -3114,6 +3113,9 @@ function groupSubSort({
   tallyPolicy,
   matchUps
 }) {
+  const excludedDirectives = [];
+  const report = [];
+  let result;
   if (participantIds?.length === 1) {
     const participantId = participantIds[0];
     return {
@@ -3122,13 +3124,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)
@@ -5754,7 +5756,8 @@ const POLICY_ROUND_NAMING_DEFAULT = {
   [POLICY_TYPE_ROUND_NAMING]: {
     policyName: "Round Naming Default",
     namingConventions: {
-      round: "Round"
+      round: "Round",
+      pre: "Pre"
     },
     qualifyingFinishMap: {
       1: "Final"
@@ -5798,12 +5801,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 || {};
@@ -5827,6 +5829,7 @@ function getRoundContextProfile({
       })
     );
   } else {
+    const qualifyingFinishgMap = isQualifying && (roundNamingPolicy?.qualifyingFinishMap || defaultRoundNamingPolicy?.qualifyingFinishMap || {});
     Object.assign(
       roundNamingProfile,
       ...roundProfileKeys.map((round) => {
@@ -11549,8 +11552,10 @@ function modifyMatchUpScore({
         const matchUpFilters = isDualMatchUp ? { matchUpTypes: [TEAM$2] } : void 0;
         const { matchUps } = getAllStructureMatchUps({
           afterRecoveryTimes: false,
+          tournamentRecord,
           inContext: true,
           matchUpFilters,
+          drawDefinition,
           structure: structure2,
           event
         });