tods-competition-factory 1.8.44 → 1.8.45

package/dist/forge/generate.mjs

@@ -16481,20 +16481,17 @@ function ensureSideLineUps({
 
 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,
@@ -16849,6 +16846,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") {
@@ -16884,10 +16882,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;
@@ -16934,6 +16934,7 @@ function validateCollectionDefinition({
   checkGender = true,
   referenceCategory,
   referenceGender,
+  eventType,
   event
 }) {
   referenceGender = referenceGender ?? event?.gender;
@@ -17001,7 +17002,7 @@ function validateCollectionDefinition({
   }
   if (checkGender) {
     const result = tieFormatGenderValidityCheck({
-      referenceEvent: event,
+      eventType: eventType ?? event?.eventType,
       referenceGender,
       matchUpType,
       gender
@@ -17033,8 +17034,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) {
@@ -17259,7 +17267,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 || [];
@@ -20130,7 +20138,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;
   }
@@ -21232,7 +21241,8 @@ function generateDrawTypeAndModifyDrawDefinition(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;
   }
@@ -23717,7 +23727,8 @@ function generateDrawDefinition(params) {
     const result = validateTieFormat({
       gender: event?.gender,
       enforceGender,
-      tieFormat
+      tieFormat,
+      event
     });
     if (result.error)
       return decorateResult({ result, stack });
@@ -23736,7 +23747,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;