tods-competition-factory 1.8.20 → 1.8.22

package/dist/forge/query.d.ts

@@ -2043,11 +2043,12 @@ declare function getOrderedDrawPositions({ drawPositions, roundProfile, roundNum
 };
 
 type GetRoundContextProfileArgs = {
+    drawDefinition?: DrawDefinition;
     matchUps: HydratedMatchUp[];
     roundNamingPolicy: any;
     structure: Structure;
 };
-declare function getRoundContextProfile({ roundNamingPolicy, structure, matchUps, }: GetRoundContextProfileArgs): ResultType & {
+declare function getRoundContextProfile({ roundNamingPolicy, drawDefinition, structure, matchUps, }: GetRoundContextProfileArgs): ResultType & {
     roundNamingProfile?: {
         [key: string]: {
             roundName: string;
@@ -2117,11 +2118,11 @@ type GetRoundMatchUpsArgs = {
     interpolate?: boolean;
 };
 type RoundMatchUpsResult = {
-    roundsNotPowerOf2?: boolean;
     roundMatchUps?: HydratedMatchUp[];
     hasNoRoundPositions?: boolean;
-    roundProfile?: RoundProfile;
+    roundsNotPowerOf2?: boolean;
     maxMatchUpsCount?: number;
+    roundProfile?: RoundProfile;
     roundNumbers?: number[];
     error?: ErrorType;
 };

package/dist/forge/query.mjs

@@ -1521,7 +1521,6 @@ const DIRECT_ENTRY_STATUSES = [
 const STRUCTURE_SELECTED_STATUSES = [
   CONFIRMED,
   DIRECT_ACCEPTANCE,
-  FEED_IN,
   JUNIOR_EXEMPT,
   LUCKY_LOSER,
   QUALIFIER,
@@ -6763,6 +6762,9 @@ const POLICY_ROUND_NAMING_DEFAULT = {
     namingConventions: {
       round: "Round"
     },
+    qualifyingFinishMap: {
+      1: "Final"
+    },
     abbreviatedRoundNamingMap: {
       // key is matchUpsCount for the round
       1: "F",
@@ -6776,7 +6778,8 @@ const POLICY_ROUND_NAMING_DEFAULT = {
     },
     affixes: {
       roundNumber: "R",
-      preFeedRound: "Q"
+      preFeedRound: "Q",
+      preQualifying: "P"
     },
     stageConstants: {
       [MAIN]: "",
@@ -6789,6 +6792,7 @@ const POLICY_ROUND_NAMING_DEFAULT = {
 
 function getRoundContextProfile({
   roundNamingPolicy,
+  drawDefinition,
   structure,
   matchUps
 }) {
@@ -6799,21 +6803,31 @@ function getRoundContextProfile({
   const isRoundRobin = structure.structures;
   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 preQualifyingAffix = preQualifyingSequence ? roundNamingPolicy?.affixes?.preQualifying || defaultRoundNamingPolicy.affixes.preQualifying || "" : "";
   const roundNamingMap = roundNamingPolicy?.roundNamingMap || defaultRoundNamingPolicy.roundNamingMap || {};
   const abbreviatedRoundNamingMap = roundNamingPolicy?.abbreviatedRoundNamingMap || defaultRoundNamingPolicy.abbreviatedRoundNamingMap || {};
-  const roundNamePrefix = roundNamingPolicy?.affixes || defaultRoundNamingPolicy.affixes;
-  const roundNumberAffix = roundNamePrefix.roundNumber || defaultRoundNamingPolicy.affixes.roundNumber;
+  const preFeedAffix = roundNamingPolicy?.affixes?.preFeedRound || defaultRoundNamingPolicy.affixes.preFeedRound;
+  const roundNumberAffix = roundNamingPolicy?.affixes?.roundNumber || defaultRoundNamingPolicy.affixes.roundNumber;
   const namingConventions = roundNamingPolicy?.namingConventions || defaultRoundNamingPolicy.namingConventions;
   const roundNameFallback = namingConventions.round;
-  const stageInitial = stage && stage !== MAIN && stage[0];
-  const stageConstants = roundNamingPolicy?.stageConstants;
-  const stageConstant = stage && stageConstants?.[stage] || stageInitial;
+  const stageInitial = stage && stage !== MAIN ? stage[0] : "";
+  const stageConstants = roundNamingPolicy?.stageConstants || defaultRoundNamingPolicy.stageConstants;
+  const stageIndicator = stage && stageConstants?.[stage] || stageInitial;
+  const stageConstant = `${preQualifyingAffix}${stageIndicator}${preQualifyingSequence}`;
   const roundProfileKeys = roundProfile ? Object.keys(roundProfile) : [];
+  const qualifyingAffix = isQualifying && stageConstants?.[QUALIFYING] ? `${stageConstants?.[QUALIFYING]}-` : "";
   if (isRoundRobin || isAdHocStructure || isLuckyStructure) {
     Object.assign(
       roundNamingProfile,
       ...roundProfileKeys.map((key) => {
-        const roundName = `${roundNameFallback} ${key}`;
+        const roundName = `${qualifyingAffix}${roundNameFallback} ${key}`;
         const abbreviatedRoundName = `${roundNumberAffix}${key}`;
         return { [key]: { roundName, abbreviatedRoundName } };
       })
@@ -6826,15 +6840,15 @@ function getRoundContextProfile({
           return;
         const { matchUpsCount, preFeedRound } = roundProfile[round];
         const participantsCount = matchUpsCount * 2;
-        const sizedRoundName = roundNamingMap[matchUpsCount] || `${roundNamePrefix.roundNumber}${participantsCount}`;
-        const suffix = preFeedRound ? `-${roundNamePrefix.preFeedRound}` : "";
+        const sizedRoundName = qualifyingFinishgMap?.[roundProfile?.[round].finishingRound] || qualifyingFinishgMap && `${roundNumberAffix}${participantsCount}` || roundNamingMap[matchUpsCount] || `${roundNumberAffix}${participantsCount}`;
+        const suffix = preFeedRound ? `-${preFeedAffix}` : "";
         const profileRoundName = `${sizedRoundName}${suffix}`;
         const roundName = [
           stageConstant,
           structureAbbreviation,
           profileRoundName
         ].filter(Boolean).join("-");
-        const sizedAbbreviation = abbreviatedRoundNamingMap[matchUpsCount] || `${roundNamePrefix.roundNumber}${participantsCount}`;
+        const sizedAbbreviation = abbreviatedRoundNamingMap[matchUpsCount] || `${roundNumberAffix}${participantsCount}`;
         const profileAbbreviation = `${sizedAbbreviation}${suffix}`;
         const abbreviatedRoundName = [
           stageConstant,
@@ -7008,6 +7022,7 @@ function getAllStructureMatchUps({
   const roundNamingPolicy = appliedPolicies?.[POLICY_TYPE_ROUND_NAMING];
   const result = getRoundContextProfile({
     roundNamingPolicy,
+    drawDefinition,
     structure,
     matchUps
   });