tods-competition-factory 0.59.2 → 0.59.3

package/dist/tods-competition-factory.cjs.development.js

@@ -3443,7 +3443,7 @@ function validateTieFormat({
   checkCollectionIds = true,
   tieFormat
 } = {}) {
-  var _tieFormat$winCriteri, _tieFormat$winCriteri2;
+  var _tieFormat$winCriteri, _tieFormat$winCriteri2, _tieFormat$winCriteri3, _tieFormat$winCriteri4;
 
   const errors = [];
 
@@ -3471,9 +3471,9 @@ function validateTieFormat({
     };
   }
 
-  const validWinCriteria = typeof ((_tieFormat$winCriteri = tieFormat.winCriteria) === null || _tieFormat$winCriteri === void 0 ? void 0 : _tieFormat$winCriteri.valueGoal) === 'number' && ((_tieFormat$winCriteri2 = tieFormat.winCriteria) === null || _tieFormat$winCriteri2 === void 0 ? void 0 : _tieFormat$winCriteri2.valueGoal) > 0;
+  const validWinCriteria = typeof ((_tieFormat$winCriteri = tieFormat.winCriteria) === null || _tieFormat$winCriteri === void 0 ? void 0 : _tieFormat$winCriteri.valueGoal) === 'number' && ((_tieFormat$winCriteri2 = tieFormat.winCriteria) === null || _tieFormat$winCriteri2 === void 0 ? void 0 : _tieFormat$winCriteri2.valueGoal) > 0 || ((_tieFormat$winCriteri3 = tieFormat.winCriteria) === null || _tieFormat$winCriteri3 === void 0 ? void 0 : _tieFormat$winCriteri3.aggregateValue);
 
-  if (!(validWinCriteria || tieFormat.winCriteria.aggregateValue)) {
+  if (!(validWinCriteria || (_tieFormat$winCriteri4 = tieFormat.winCriteria) !== null && _tieFormat$winCriteri4 !== void 0 && _tieFormat$winCriteri4.aggregateValue)) {
     errors.push('Either non-zero valueGoal, or { aggregateValue: true } must be specified in winCriteria');
     return {
       error: INVALID_TIE_FORMAT,
@@ -3672,38 +3672,39 @@ function generateTieMatchUpScore({
       collectionMatchUps.forEach(matchUp => {
         if (matchUp.winningSide) sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
       });
-    } else if (Array.isArray(collectionValueProfile)) {
-      collectionMatchUps.forEach(matchUp => {
-        if (matchUp.winningSide) {
-          const collectionPosition = matchUp.collectionPosition;
-          const matchUpValue = getCollectionPositionValue({
-            collectionDefinition,
-            collectionPosition
-          });
-          sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
-        }
-      });
     } else if (setValue) {
       collectionMatchUps.forEach(matchUp => {
-        var _matchUp$score$sets;
+        var _matchUp$score, _matchUp$score$sets;
 
-        (_matchUp$score$sets = matchUp.score.sets) === null || _matchUp$score$sets === void 0 ? void 0 : _matchUp$score$sets.forEach(set => {
+        (_matchUp$score = matchUp.score) === null || _matchUp$score === void 0 ? void 0 : (_matchUp$score$sets = _matchUp$score.sets) === null || _matchUp$score$sets === void 0 ? void 0 : _matchUp$score$sets.forEach(set => {
           if (set.winningSide) sideMatchUpValues[set.winningSide - 1] += setValue;
         });
       });
     } else if (scoreValue) {
       collectionMatchUps.forEach(matchUp => {
-        var _matchUp$score$sets2;
+        var _matchUp$score2, _matchUp$score2$sets;
 
-        (_matchUp$score$sets2 = matchUp.score.sets) === null || _matchUp$score$sets2 === void 0 ? void 0 : _matchUp$score$sets2.forEach(set => {
+        (_matchUp$score2 = matchUp.score) === null || _matchUp$score2 === void 0 ? void 0 : (_matchUp$score2$sets = _matchUp$score2.sets) === null || _matchUp$score2$sets === void 0 ? void 0 : _matchUp$score2$sets.forEach(set => {
           const {
-            scoreSide1 = 0,
-            scoreSide2 = 0
+            side1Score = 0,
+            side2Score = 0
           } = set;
-          sideMatchUpValues[0] = scoreSide1;
-          sideMatchUpValues[2] = scoreSide2;
+          sideMatchUpValues[0] += side1Score;
+          sideMatchUpValues[1] += side2Score;
         });
       });
+    } else if (Array.isArray(collectionValueProfile)) {
+      // this must come last because it will be true for []
+      collectionMatchUps.forEach(matchUp => {
+        if (matchUp.winningSide) {
+          const collectionPosition = matchUp.collectionPosition;
+          const matchUpValue = getCollectionPositionValue({
+            collectionDefinition,
+            collectionPosition
+          });
+          sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
+        }
+      });
     }
 
     if (collectionValue) {
@@ -3935,7 +3936,7 @@ function checkSetIsComplete$1({
     error: MISSING_VALUE
   };
   matchUpScoringFormat = matchUpScoringFormat || matchUpFormat;
-  const setFormat = isDecidingSet && matchUpScoringFormat.finalSetFormat || ((_matchUpScoringFormat = matchUpScoringFormat) === null || _matchUpScoringFormat === void 0 ? void 0 : _matchUpScoringFormat.setFormat);
+  const setFormat = isDecidingSet && matchUpScoringFormat.finalSetFormat || ((_matchUpScoringFormat = matchUpScoringFormat) === null || _matchUpScoringFormat === void 0 ? void 0 : _matchUpScoringFormat.setFormat) || {};
   const {
     side1Score,
     side2Score
@@ -4038,7 +4039,7 @@ function keyValueSetScore({
     setTo,
     tiebreakAt,
     NoAD
-  } = analysis.setFormat;
+  } = analysis === null || analysis === void 0 ? void 0 : analysis.setFormat;
   const needsTiebreak = value === parseInt(tiebreakAt || setTo);
   if (tiebreakAt && tiebreakAt < setTo && value > tiebreakAt) return {
     scoreString
@@ -7113,7 +7114,7 @@ const countries = [{
   phone: '263'
 }];
 
-var collectionDefinitions$4 = [
+var collectionDefinitions$5 = [
 	{
 		collectionName: "Doubles",
 		matchUpCount: 3,
@@ -7129,17 +7130,17 @@ var collectionDefinitions$4 = [
 		matchUpValue: 1
 	}
 ];
-var tieFormatName$3 = "COLLEGE_D3";
-var winCriteria$4 = {
+var tieFormatName$4 = "COLLEGE_D3";
+var winCriteria$5 = {
 	valueGoal: 5
 };
 var COLLEGE_D3$1 = {
-	collectionDefinitions: collectionDefinitions$4,
-	tieFormatName: tieFormatName$3,
-	winCriteria: winCriteria$4
+	collectionDefinitions: collectionDefinitions$5,
+	tieFormatName: tieFormatName$4,
+	winCriteria: winCriteria$5
 };
 
-var collectionDefinitions$3 = [
+var collectionDefinitions$4 = [
 	{
 		collectionName: "Doubles",
 		collectionValue: 1,
@@ -7155,17 +7156,17 @@ var collectionDefinitions$3 = [
 		matchUpValue: 1
 	}
 ];
-var tieFormatName$2 = "COLLEGE_DEFAULT";
-var winCriteria$3 = {
+var tieFormatName$3 = "COLLEGE_DEFAULT";
+var winCriteria$4 = {
 	valueGoal: 5
 };
 var COLLEGE_DEFAULT$1 = {
-	collectionDefinitions: collectionDefinitions$3,
-	tieFormatName: tieFormatName$2,
-	winCriteria: winCriteria$3
+	collectionDefinitions: collectionDefinitions$4,
+	tieFormatName: tieFormatName$3,
+	winCriteria: winCriteria$4
 };
 
-var collectionDefinitions$2 = [
+var collectionDefinitions$3 = [
 	{
 		collectionName: "Doubles",
 		matchUpCount: 3,
@@ -7181,17 +7182,17 @@ var collectionDefinitions$2 = [
 		matchUpValue: 1
 	}
 ];
-var tieFormatName$1 = "COLLEGE_JUCO";
-var winCriteria$2 = {
+var tieFormatName$2 = "COLLEGE_JUCO";
+var winCriteria$3 = {
 	valueGoal: 5
 };
 var COLLEGE_JUCO$1 = {
-	collectionDefinitions: collectionDefinitions$2,
-	tieFormatName: tieFormatName$1,
-	winCriteria: winCriteria$2
+	collectionDefinitions: collectionDefinitions$3,
+	tieFormatName: tieFormatName$2,
+	winCriteria: winCriteria$3
 };
 
-var collectionDefinitions$1 = [
+var collectionDefinitions$2 = [
 	{
 		collectionName: "Doubles",
 		matchUpCount: 1,
@@ -7207,20 +7208,20 @@ var collectionDefinitions$1 = [
 		matchUpValue: 1
 	}
 ];
-var tieFormatName = "DOMINANT_DUO";
-var winCriteria$1 = {
+var tieFormatName$1 = "DOMINANT_DUO";
+var winCriteria$2 = {
 	valueGoal: 2
 };
 var DOMINANT_DUO_TIE_FORMAT = {
-	collectionDefinitions: collectionDefinitions$1,
-	tieFormatName: tieFormatName,
-	winCriteria: winCriteria$1
+	collectionDefinitions: collectionDefinitions$2,
+	tieFormatName: tieFormatName$1,
+	winCriteria: winCriteria$2
 };
 
-var winCriteria = {
+var winCriteria$1 = {
 	valueGoal: 13
 };
-var collectionDefinitions = [
+var collectionDefinitions$1 = [
 	{
 		collectionGroupNumber: 1,
 		matchUpType: "DOUBLES",
@@ -7279,17 +7280,51 @@ var collectionGroups = [
 	}
 ];
 var LAVER_CUP_TIE_FORMAT = {
-	winCriteria: winCriteria,
-	collectionDefinitions: collectionDefinitions,
+	winCriteria: winCriteria$1,
+	collectionDefinitions: collectionDefinitions$1,
 	collectionGroups: collectionGroups
 };
 
+var collectionDefinitions = [
+	{
+		collectionName: "Round 1",
+		matchUpCount: 3,
+		matchUpFormat: "SET1-S:T20",
+		matchUpType: "DOUBLES",
+		scoreValue: 1
+	},
+	{
+		collectionName: "Round 2",
+		matchUpCount: 3,
+		matchUpFormat: "SET1-S:T20",
+		matchUpType: "DOUBLES",
+		scoreValue: 1
+	},
+	{
+		collectionName: "Round 3",
+		matchUpCount: 3,
+		matchUpFormat: "SET1-S:T20",
+		matchUpType: "DOUBLES",
+		scoreValue: 1
+	}
+];
+var tieFormatName = "Doubles Shuffle";
+var winCriteria = {
+	aggregateValue: true
+};
+var TEAM_AGGREGATION_TIE_FORMAT = {
+	collectionDefinitions: collectionDefinitions,
+	tieFormatName: tieFormatName,
+	winCriteria: winCriteria
+};
+
 const tieFormats = {
   COLLEGE_D3: COLLEGE_D3$1,
   COLLEGE_DEFAULT: COLLEGE_DEFAULT$1,
   COLLEGE_JUCO: COLLEGE_JUCO$1,
   DOMINANT_DUO: DOMINANT_DUO_TIE_FORMAT,
-  LAVER_CUP: LAVER_CUP_TIE_FORMAT
+  LAVER_CUP: LAVER_CUP_TIE_FORMAT,
+  TEAM_AGGREGATION: TEAM_AGGREGATION_TIE_FORMAT
 };
 
 const POLICY_AVOIDANCE_COUNTRY = {
@@ -27867,7 +27902,7 @@ const scheduleGovernor$1 = {
 };
 
 function factoryVersion() {
-  return '0.59.2';
+  return '0.59.3';
 }
 
 function attachPolicies$2({
@@ -41570,12 +41605,14 @@ const COLLEGE_JUCO = 'COLLEGE_JUCO';
 const COLLEGE_D3 = 'COLLEGE_D3';
 const DOMINANT_DUO = 'DOMINANT_DUO';
 const LAVER_CUP = 'LAVER_CUP';
+const TEAM_AGGREGATION = 'TEAM_AGGREGATION';
 const tieFormatConstants = {
   COLLEGE_D3,
   COLLEGE_DEFAULT,
   COLLEGE_JUCO,
   DOMINANT_DUO,
-  LAVER_CUP
+  LAVER_CUP,
+  TEAM_AGGREGATION
 };
 
 const namedFormats = {
@@ -41637,7 +41674,8 @@ const namedFormats = {
     valueGoal: 5
   },
   [LAVER_CUP]: LAVER_CUP_TIE_FORMAT,
-  [DOMINANT_DUO]: DOMINANT_DUO_TIE_FORMAT
+  [DOMINANT_DUO]: DOMINANT_DUO_TIE_FORMAT,
+  [TEAM_AGGREGATION]: TEAM_AGGREGATION_TIE_FORMAT
 };
 const tieFormatDefaults = ({
   namedFormat,
@@ -49800,7 +49838,7 @@ function generateSet({
       const {
         NoAD: tiebreakNoAd,
         tiebreakTo
-      } = tiebreakFormat || tiebreakSet;
+      } = tiebreakFormat || tiebreakSet || {};
       const range = generateRange(1, tiebreakTo + 1).map(value => generateRange(0, tiebreakTo + 2 - value).map(() => value)).flat();
       const lowValue = range[randomInt(0, range.length - 1)];
       let scores = getTiebreakComplement({