tods-competition-factory 1.8.34 → 1.8.36

package/dist/forge/generate.mjs

@@ -10748,11 +10748,11 @@ function swapAssignedPositions({
   );
   const secondAssignment = candidatePositionAssignments.find(
     (assignment) => assignment.drawPosition === secondPosition
-  );
+  ) ?? {};
   const updatedFirstAssignmentAttributes = {
-    participantId: secondAssignment.participantId,
-    qualifier: secondAssignment.qualifier,
-    bye: secondAssignment.bye
+    participantId: secondAssignment?.participantId,
+    qualifier: secondAssignment?.qualifier,
+    bye: secondAssignment?.bye
   };
   const updatedSecondAssignmentAttributes = {
     participantId: firstAssignment.participantId,
@@ -12233,7 +12233,7 @@ function randomUnseededSeparation({
       });
       if (result.error)
         return decorateResult({ result, stack });
-    } else {
+    } else if (assignment.participantId) {
       const result = assignDrawPosition({
         automaticPlacement: true,
         inContextDrawMatchUps,
@@ -18752,12 +18752,11 @@ function getParticipantEntries(params) {
   const targetParticipantIds = participantFilters?.participantIds;
   const getRelevantParticipantIds = (participantId) => {
     const relevantParticipantIds = [participantId];
-    relevantParticipantIds.push(participantId);
     participantMap[participantId]?.participant.individualParticipantIds?.forEach(
       (individualParticiapntId) => relevantParticipantIds.push(individualParticiapntId)
     );
     return relevantParticipantIds.some(
-      (obj) => !targetParticipantIds?.length || targetParticipantIds.includes(obj.relevantParticipantId)
+      (id) => !targetParticipantIds?.length || targetParticipantIds.includes(id)
     ) ? relevantParticipantIds : [];
   };
   const withOpts = {
@@ -23570,7 +23569,13 @@ const POLICY_SEEDING_USTA = {
     validSeedPositions: { ignore: true },
     duplicateSeedNumbers: true,
     drawSizeProgression: true,
-    seedingProfile: { positioning: SEPARATE },
+    seedingProfile: {
+      drawTypes: {
+        [ROUND_ROBIN_WITH_PLAYOFF]: { positioning: WATERFALL },
+        [ROUND_ROBIN]: { positioning: WATERFALL }
+      },
+      positioning: SEPARATE
+    },
     policyName: "USTA SEEDING",
     seedsCountThresholds: [
       { drawSize: 4, minimumParticipantCount: 3, seedsCount: 2 },
@@ -23591,11 +23596,9 @@ function generateDrawDefinition(params) {
     ignoreAllowedDrawTypes,
     voluntaryConsolation,
     hydrateCollections,
-    policyDefinitions,
     ignoreStageSpace,
     tournamentRecord,
     qualifyingOnly,
-    seedingProfile,
     tieFormatName,
     drawEntries,
     addToEvent,
@@ -23606,8 +23609,19 @@ function generateDrawDefinition(params) {
     tournamentRecord,
     event
   }).appliedPolicies ?? {};
-  const drawTypeCoercion = params.drawTypeCoercion ?? appliedPolicies?.[POLICY_TYPE_DRAWS]?.drawTypeCoercion ?? true;
+  const policyDefinitions = params.policyDefinitions ?? {};
+  const drawTypeCoercion = params.drawTypeCoercion ?? policyDefinitions?.[POLICY_TYPE_DRAWS]?.drawTypeCoercion ?? appliedPolicies?.[POLICY_TYPE_DRAWS]?.drawTypeCoercion ?? true;
   const drawType = drawTypeCoercion && params.drawSize === 2 && DrawTypeEnum.SingleElimination || params.drawType || DrawTypeEnum.SingleElimination;
+  const seedingPolicy = policyDefinitions?.[POLICY_TYPE_SEEDING] ?? appliedPolicies?.[POLICY_TYPE_SEEDING];
+  const seedingProfile = params.seedingProfile ?? seedingPolicy?.seedingProfile?.drawTypes?.[drawType] ?? seedingPolicy?.seedingProfile;
+  if (params.seedingProfile) {
+    if (!policyDefinitions[POLICY_TYPE_SEEDING]) {
+      policyDefinitions[POLICY_TYPE_SEEDING] = {
+        ...POLICY_SEEDING_USTA[POLICY_TYPE_SEEDING]
+      };
+    }
+    policyDefinitions[POLICY_TYPE_SEEDING].seedingProfile = seedingProfile;
+  }
   const { participants, participantMap } = getParticipants({
     withIndividualParticipants: true,
     tournamentRecord
@@ -23740,7 +23754,7 @@ function generateDrawDefinition(params) {
       }
     }
   }
-  if (!appliedPolicies[POLICY_TYPE_SEEDING]) {
+  if (!appliedPolicies[POLICY_TYPE_SEEDING] && !policyDefinitions[POLICY_TYPE_SEEDING]) {
     attachPolicies({ drawDefinition, policyDefinitions: POLICY_SEEDING_USTA });
     Object.assign(appliedPolicies, POLICY_SEEDING_USTA);
   }