tods-competition-factory 1.8.44 → 1.8.45

package/dist/index.mjs

@@ -2404,7 +2404,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.8.44";
+  return "1.8.45";
 }
 
 function getObjectTieFormat(obj) {
@@ -2634,20 +2634,17 @@ var ParticipantTypeEnum = /* @__PURE__ */ ((ParticipantTypeEnum2) => {
 
 const mixedGenderError = "MIXED events can not contain mixed singles or { gender: ANY } collections";
 const anyMixedError = "events with { gender: ANY } can not contain MIXED singles collections";
-function tieFormatGenderValidityCheck({
-  referenceEvent,
-  referenceGender,
-  matchUpType,
-  gender
-}) {
+function tieFormatGenderValidityCheck(params) {
   const stack = "tieFormatGenderValidityCheck";
+  const { referenceGender, matchUpType, gender } = params;
   if (referenceGender && gender && [GenderEnum.Male, GenderEnum.Female].includes(referenceGender) && referenceGender !== gender)
     return decorateResult({
       result: { valid: false, error: INVALID_GENDER },
       context: { gender },
       stack
     });
-  if (referenceGender === MIXED && (referenceEvent?.eventType !== TEAM$2 || gender === ANY || gender === MIXED && matchUpType !== TypeEnum.Doubles)) {
+  const eventType = params.eventType ?? params.referenceEvent?.eventType;
+  if (referenceGender === MIXED && (eventType !== TEAM$2 || gender === ANY || gender === MIXED && matchUpType !== TypeEnum.Doubles)) {
     return decorateResult({
       result: { error: INVALID_GENDER, valid: false },
       info: mixedGenderError,
@@ -2899,6 +2896,7 @@ function validateTieFormat(params) {
   const checkGender = !!(params?.enforceGender !== false && params?.gender);
   const checkCollectionIds = params?.checkCollectionIds;
   const tieFormat = params?.tieFormat;
+  const event = params?.event;
   const stack = "validateTieFormat";
   const errors = [];
   if (!params || !tieFormat || typeof tieFormat !== "object") {
@@ -2934,10 +2932,12 @@ function validateTieFormat(params) {
       const { valid: valid2, errors: collectionDefinitionErrors } = validateCollectionDefinition({
         referenceCategory: params.category,
         referenceGender: params.gender,
+        eventType: params.eventType,
         collectionDefinition,
         checkCollectionIds,
         checkCategory,
-        checkGender
+        checkGender,
+        event
       });
       if (valid2) {
         return true;
@@ -2984,6 +2984,7 @@ function validateCollectionDefinition({
   checkGender = true,
   referenceCategory,
   referenceGender,
+  eventType,
   event
 }) {
   referenceGender = referenceGender ?? event?.gender;
@@ -3051,7 +3052,7 @@ function validateCollectionDefinition({
   }
   if (checkGender) {
     const result = tieFormatGenderValidityCheck({
-      referenceEvent: event,
+      eventType: eventType ?? event?.eventType,
       referenceGender,
       matchUpType,
       gender
@@ -3083,8 +3084,15 @@ function validateCollectionDefinition({
     });
   return { valid: true };
 }
-function checkTieFormat(tieFormat) {
-  const result = validateTieFormat({ tieFormat, checkCollectionIds: false });
+function checkTieFormat({
+  tieFormat,
+  eventType
+}) {
+  const result = validateTieFormat({
+    checkCollectionIds: false,
+    eventType,
+    tieFormat
+  });
   if (result.error)
     return result;
   for (const collectionDefinition of tieFormat.collectionDefinitions) {
@@ -8748,7 +8756,7 @@ function generateTieMatchUpScore(params) {
   const tieFormat = resolveTieFormat({ matchUp, drawDefinition, structure, event })?.tieFormat || params?.tieFormat;
   if (!tieFormat)
     return { error: MISSING_TIE_FORMAT };
-  const result = validateTieFormat({ tieFormat });
+  const result = validateTieFormat({ tieFormat, eventType: event?.eventType });
   if (result.error)
     return result;
   const collectionDefinitions = tieFormat?.collectionDefinitions || [];
@@ -33316,7 +33324,10 @@ function modifyCollectionDefinition$1({
     modifications.push({ collectionId, gender });
   }
   const modifiedTieFormat = definedAttributes(tieFormat);
-  result = validateTieFormat({ tieFormat: modifiedTieFormat });
+  result = validateTieFormat({
+    tieFormat: modifiedTieFormat,
+    eventType: event?.eventType
+  });
   if (result.error) {
     return decorateResult({ result, stack });
   }
@@ -33587,7 +33598,8 @@ function removeCollectionDefinition$1({
   matchUp = matchUp ?? result?.matchUp;
   const existingTieFormat = result?.tieFormat;
   const tieFormat = copyTieFormat(existingTieFormat);
-  result = validateTieFormat({ tieFormat });
+  const eventType = event?.eventType;
+  result = validateTieFormat({ tieFormat, eventType });
   if (result.error)
     return decorateResult({ result, stack });
   const targetCollection = tieFormat?.collectionDefinitions?.find(
@@ -33724,7 +33736,7 @@ function removeCollectionDefinition$1({
     });
   }
   const prunedTieFormat = definedAttributes(tieFormat);
-  result = validateTieFormat({ tieFormat: prunedTieFormat });
+  result = validateTieFormat({ tieFormat: prunedTieFormat, eventType });
   if (result.error)
     return decorateResult({ result, stack });
   if (eventId && event) {
@@ -33816,7 +33828,8 @@ function addCollectionDefinition$1({
   matchUp = matchUp ?? result?.matchUp;
   const existingTieFormat = matchUp?.tieFormat ?? result?.tieFormat;
   const tieFormat = copyTieFormat(existingTieFormat);
-  result = validateTieFormat({ tieFormat });
+  const eventType = event?.eventType;
+  result = validateTieFormat({ tieFormat, eventType });
   if (result?.error) {
     return decorateResult({ result: { error: result.error }, stack });
   }
@@ -33851,7 +33864,7 @@ function addCollectionDefinition$1({
   const addedMatchUps = [];
   let targetMatchUps = [];
   const prunedTieFormat = definedAttributes(tieFormat);
-  result = validateTieFormat({ tieFormat: prunedTieFormat });
+  result = validateTieFormat({ tieFormat: prunedTieFormat, eventType });
   if (result?.error) {
     return decorateResult({ result: { error: result.error }, stack });
   }
@@ -34139,7 +34152,10 @@ function collectionGroupUpdate({
     event
   });
   const prunedTieFormat = definedAttributes(tieFormat);
-  const result = validateTieFormat({ tieFormat: prunedTieFormat });
+  const result = validateTieFormat({
+    eventType: event?.eventType,
+    tieFormat: prunedTieFormat
+  });
   if (result.error)
     return result;
   if (eventId && event) {
@@ -34189,7 +34205,7 @@ function removeCollectionGroup$1({
   const originalValueGoal = existingTieFormat?.winCriteria.valueGoal;
   const wasAggregateValue = existingTieFormat?.winCriteria.aggregateValue;
   const tieFormat = copyTieFormat(existingTieFormat);
-  result = validateTieFormat({ tieFormat });
+  result = validateTieFormat({ tieFormat, eventType: event?.eventType });
   if (result.error)
     return decorateResult({ result, stack });
   const modifiedCollectionIds = [];
@@ -34276,7 +34292,7 @@ function addCollectionGroup$1({
   const existingTieFormat = result?.tieFormat;
   const originalValueGoal = existingTieFormat?.winCriteria.valueGoal;
   const tieFormat = copyTieFormat(existingTieFormat);
-  result = validateTieFormat({ tieFormat });
+  result = validateTieFormat({ tieFormat, eventType: event.eventType });
   if (result.error)
     return decorateResult({ result, stack });
   for (const collectionDefinition of tieFormat.collectionDefinitions) {
@@ -34340,7 +34356,10 @@ function modifyTieFormat$1({
   event
 }) {
   const stack = "modifyTieFormat";
-  if (!validateTieFormat({ tieFormat: modifiedTieFormat }).valid) {
+  if (!validateTieFormat({
+    tieFormat: modifiedTieFormat,
+    eventType: event?.eventType
+  }).valid) {
     return decorateResult({
       result: { error: INVALID_TIE_FORMAT },
       info: "falied validation",
@@ -42902,7 +42921,8 @@ function generateDrawTypeAndModifyDrawDefinition$1(params) {
   const drawDefinition = modifyOriginal ? params.drawDefinition : makeDeepCopy(params.drawDefinition, false, true);
   let { tieFormat, matchUpType } = params;
   if (tieFormat) {
-    const result2 = validateTieFormat({ tieFormat });
+    const eventType = params.event?.eventType;
+    const result2 = validateTieFormat({ tieFormat, eventType });
     if (result2.error)
       return result2;
   }
@@ -45369,7 +45389,8 @@ function generateVoluntaryConsolation$1(params) {
     return { error: INVALID_DRAW_SIZE };
   let { tieFormat, matchUpType } = params;
   if (tieFormat) {
-    const result2 = validateTieFormat({ tieFormat });
+    const eventType = params.event?.eventType;
+    const result2 = validateTieFormat({ tieFormat, eventType });
     if (result2.error)
       return result2;
   }
@@ -53818,15 +53839,13 @@ function generateLineUps(params) {
     return { error: MISSING_TOURNAMENT_RECORD };
   if (!tieFormat && !drawDefinition)
     return { error: DRAW_DEFINITION_NOT_FOUND };
-  tieFormat = tieFormat || resolveTieFormat({ drawDefinition, event })?.tieFormat;
-  if (validateTieFormat({ tieFormat }).error)
+  tieFormat = tieFormat ?? resolveTieFormat({ drawDefinition, event })?.tieFormat;
+  if (validateTieFormat({ tieFormat, eventType: params.event?.eventType }).error)
     return { error: INVALID_TIE_FORMAT };
   if (typeof scaleAccessor !== "object" && !useDefaultEventRanking)
     return { error: INVALID_VALUES, context: { scaleAccessor } };
   const lineUps = {};
-  const targetEntries = (drawDefinition?.entries || event.entries).filter(
-    (entry) => entry?.entryStatus === DIRECT_ACCEPTANCE
-  );
+  const targetEntries = (drawDefinition?.entries ?? event?.entries ?? []).filter((entry) => entry?.entryStatus === DIRECT_ACCEPTANCE);
   const participantIds = targetEntries.map(getParticipantId);
   const { participants = [] } = getParticipants$1({
     withIndividualParticipants: true,
@@ -53837,7 +53856,7 @@ function generateLineUps(params) {
     ({ participantId }) => participantIds.includes(participantId)
   );
   const formatScaleType = (type) => type === RANKING$1 ? "rankings" : "ratings";
-  const defaultScaleName = event?.category?.categoryName || event?.category?.ageCategoryCode;
+  const defaultScaleName = event?.category?.categoryName ?? event?.category?.ageCategoryCode;
   const {
     scaleName = defaultScaleName,
     scaleType = RANKING$1,
@@ -53869,7 +53888,7 @@ function generateLineUps(params) {
   const singlesScaleSort = (a, b) => sortMethod(a, b, SINGLES_MATCHUP);
   const doublesScaleSort = (a, b) => sortMethod(a, b, DOUBLES_MATCHUP);
   const participantIdPairs = [];
-  const collectionDefinitions = tieFormat.collectionDefinitions || [];
+  const collectionDefinitions = tieFormat?.collectionDefinitions ?? [];
   for (const teamParticipant of teamParticipants) {
     const singlesSort = teamParticipant.individualParticipants.sort(singlesScaleSort);
     const doublesSort = singlesOnly ? singlesSort : teamParticipant.individualParticipants.sort(doublesScaleSort);
@@ -53884,7 +53903,7 @@ function generateLineUps(params) {
         const participantIds2 = [];
         generateRange(0, singlesMatchUp ? 1 : 2).forEach((i2) => {
           const nextParticipantId = typeSort.find((participant) => {
-            const targetGender = [MALE, FEMALE].includes(gender) && gender || gender === MIXED && [MALE, FEMALE][i2];
+            const targetGender = gender && ([MALE, FEMALE].includes(gender) && gender || gender === MIXED && [MALE, FEMALE][i2]);
             return (!targetGender || targetGender === participant.person.sex) && !collectionParticipantIds.includes(participant.participantId);
           }).participantId;
           if (nextParticipantId) {
@@ -57248,7 +57267,10 @@ function addEvent({
   };
   if (event.eventType === TypeEnum.Team) {
     if (event.tieFormat) {
-      const result = validateTieFormat({ tieFormat: event.tieFormat });
+      const result = validateTieFormat({
+        tieFormat: event.tieFormat,
+        eventType: event.eventType
+      });
       if (result.error)
         return result;
     } else if (event.tieFormatName) {
@@ -59659,7 +59681,8 @@ function generateDrawDefinition(params) {
     const result = validateTieFormat({
       gender: event?.gender,
       enforceGender,
-      tieFormat
+      tieFormat,
+      event
     });
     if (result.error)
       return decorateResult({ result, stack });
@@ -59678,7 +59701,10 @@ function generateDrawDefinition(params) {
     const equivalentInScope = matchUpFormat && event?.matchUpFormat === matchUpFormat || event?.tieFormat && tieFormat && JSON.stringify(event.tieFormat) === JSON.stringify(tieFormat);
     if (!equivalentInScope) {
       if (tieFormat) {
-        const result = checkTieFormat(tieFormat);
+        const result = checkTieFormat({
+          eventType: event.eventType,
+          tieFormat
+        });
         if (result.error)
           return decorateResult({ result, stack });
         drawDefinition.tieFormat = result.tieFormat ?? tieFormat;
@@ -60094,11 +60120,12 @@ function aggregateTieFormats({
         addedCount += 1;
       }
     };
-    checkTieFormat(event);
+    const eventType = event.eventType;
+    checkTieFormat({ tieFormat: event.tieFormat, eventType });
     for (const drawDefinition of event.drawDefinitions ?? []) {
-      checkTieFormat(drawDefinition);
+      checkTieFormat({ tieFormat: drawDefinition.tieFormat, eventType });
       for (const structure of drawDefinition.structures ?? []) {
-        checkTieFormat(structure);
+        checkTieFormat({ tieFormat: structure.tieFormat, eventType });
       }
     }
     const setTieFormatId = (matchUpId, tieFormatId) => {