tods-competition-factory 1.8.26 → 1.8.27

package/dist/forge/generate.mjs

@@ -1452,6 +1452,7 @@ const POLICY_TYPE_MATCHUP_ACTIONS = "matchUpActions";
 const POLICY_TYPE_ROUND_NAMING = "roundNaming";
 const POLICY_TYPE_PARTICIPANT = "participant";
 const POLICY_TYPE_SCHEDULING = "scheduling";
+const POLICY_TYPE_AVOIDANCE = "avoidance";
 const POLICY_TYPE_DISPLAY = "display";
 const POLICY_TYPE_SCORING = "scoring";
 const POLICY_TYPE_SEEDING = "seeding";
@@ -10031,6 +10032,48 @@ function assignFedDrawPositionBye({
   }
 }
 
+function processAccessors({
+  significantCharacters,
+  accessors = [],
+  value
+}) {
+  const extractedValues = [];
+  const accessor = accessors[0];
+  if (value?.[accessor]) {
+    const remainingKeys = accessors.slice(1);
+    if (Array.isArray(value[accessor])) {
+      const values = value[accessor];
+      values.forEach((nestedValue) => {
+        const result = processAccessors({
+          accessors: remainingKeys,
+          significantCharacters,
+          value: nestedValue
+        });
+        extractedValues.push(...result);
+      });
+    } else {
+      value = value[accessor];
+      if (remainingKeys.length) {
+        const result = processAccessors({
+          accessors: remainingKeys,
+          significantCharacters,
+          value
+        });
+        extractedValues.push(...result);
+      } else {
+        checkValue({ value });
+      }
+    }
+  }
+  function checkValue({ value: value2 }) {
+    if (value2 && ["string", "number"].includes(typeof value2)) {
+      const extractedValue = significantCharacters ? value2.slice(0, significantCharacters) : value2;
+      extractedValues.push(extractedValue);
+    }
+  }
+  return extractedValues;
+}
+
 function getAttributeGroupings({
   targetParticipantIds,
   policyAttributes,
@@ -10082,8 +10125,14 @@ function extractAttributeValues({
   policyAttributes.forEach((policyAttribute) => {
     const { directive, groupings, key, significantCharacters } = policyAttribute || {};
     if (key) {
-      const keys = key.split(".");
-      processKeys({ value: participant, keys, significantCharacters });
+      const accessors = key.split(".");
+      extractedValues.push(
+        ...processAccessors({
+          significantCharacters,
+          value: participant,
+          accessors
+        })
+      );
     } else if (directive) {
       const includeIds = policyAttribute?.includeIds;
       const collectionIds = (idCollections?.[directive] || []).filter(
@@ -10112,32 +10161,6 @@ function extractAttributeValues({
   });
   const values = unique(extractedValues);
   return { values };
-  function processKeys({ value, keys = [], significantCharacters }) {
-    for (const [index, key] of keys.entries()) {
-      if (value?.[key]) {
-        if (Array.isArray(value[key])) {
-          const values2 = value[key];
-          const remainingKeys = keys.slice(index);
-          values2.forEach(
-            (nestedValue) => processKeys({
-              value: nestedValue,
-              keys: remainingKeys,
-              significantCharacters
-            })
-          );
-        } else {
-          value = value[key];
-          checkValue({ value, index });
-        }
-      }
-    }
-    function checkValue({ value: value2, index }) {
-      if (value2 && index === keys.length - 1 && ["string", "number"].includes(typeof value2)) {
-        const extractedValue = significantCharacters ? value2.slice(0, significantCharacters) : value2;
-        extractedValues.push(extractedValue);
-      }
-    }
-  }
 }
 
 function getPositionedParticipants({
@@ -10792,10 +10815,11 @@ function updateMatchUpStatusCodes({
     );
     matchUp.matchUpStatusCodes = (matchUp.matchUpStatusCodes ?? []).map(
       (code) => {
-        if (code.sideNumber === sourceSideNumber) {
-          return { ...code, previousMatchUpStatus: sourceMatchUpStatus };
+        const value = isString(code) || !isNaN(code) ? { code } : code;
+        if (value.sideNumber === sourceSideNumber) {
+          return { ...value, previousMatchUpStatus: sourceMatchUpStatus };
         }
-        return code;
+        return value;
       }
     );
   }
@@ -12206,7 +12230,7 @@ function positionUnseededParticipants({
     drawDefinition,
     event
   });
-  let { avoidance } = appliedPolicies ?? {};
+  let avoidance = (appliedPolicies ?? {})[POLICY_TYPE_AVOIDANCE];
   if (structure.stage === PLAY_OFF) {
     const groupings = entries.reduce((groupings2, entry) => {
       if (!groupings2[entry.groupingValue])
@@ -16319,6 +16343,29 @@ function ensureSideLineUps({
   }
 }
 
+function genderValidityCheck({
+  referenceGender,
+  matchUpType,
+  gender
+}) {
+  const stack = "genderValidityCheck";
+  if (referenceGender && gender && [GenderEnum.Male, GenderEnum.Female].includes(referenceGender) && [GenderEnum.Male, GenderEnum.Female].includes(gender)) {
+    const valid = gender === referenceGender;
+    return valid ? { valid: true } : decorateResult({
+      result: { valid: false, error: INVALID_GENDER },
+      context: { gender },
+      stack
+    });
+  }
+  if (matchUpType === TypeEnum.Singles && referenceGender === MIXED)
+    return decorateResult({
+      info: "matchUpType SINGLES is invalid for gender MIXED",
+      result: { error: INVALID_GENDER, valid: false },
+      stack
+    });
+  return { valid: true };
+}
+
 const typeMatch = (arr, type) => arr.filter(Boolean).every((i) => typeof i === type);
 const allNumeric = (arr) => arr.filter(Boolean).every(isNumeric);
 function getCategoryAgeDetails(params) {
@@ -16808,13 +16855,19 @@ function validateCollectionDefinition({
   if (matchUpFormat && !matchUpFormatCode.isValid(matchUpFormat)) {
     errors.push(`Invalid matchUpFormat: ${matchUpFormat}`);
   }
-  if (checkGender && referenceGender && gender && [GenderEnum.Male, GenderEnum.Female].includes(referenceGender) && referenceGender !== gender) {
-    errors.push(`Invalid gender: ${gender}`);
-    return decorateResult({
-      result: { error: INVALID_GENDER, errors },
-      context: { referenceGender, gender },
-      stack
+  if (checkGender) {
+    const result = genderValidityCheck({
+      referenceGender,
+      matchUpType,
+      gender
     });
+    if (result.error) {
+      return decorateResult({
+        context: { referenceGender, gender },
+        result,
+        stack
+      });
+    }
   }
   if (checkCategory && referenceCategory && category) {
     const result = categoryCanContain({