tods-competition-factory 1.7.11 → 1.7.12

package/dist/index.mjs

@@ -333,7 +333,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.7.11";
+  return "1.7.12";
 }
 
 function getObjectTieFormat(obj) {
@@ -16620,7 +16620,6 @@ function compareTieFormats({
   );
   const nameDifference = !!(considerations?.collectionName && descendant.collectionDefinitions.map(({ collectionName }) => collectionName).join("|") !== ancestor.collectionDefinitions.map(({ collectionName }) => collectionName).join("|"));
   const orderDifference = !!(considerations?.collectionOrder && descendant.collectionDefinitions.map(({ collectionOrder }) => collectionOrder).join("|") !== ancestor.collectionDefinitions.map(({ collectionOrder }) => collectionOrder).join("|"));
-  const different = nameDifference || orderDifference || ancestorDesc !== descendantDesc;
   const descendantCollectionDefinitions = Object.assign(
     {},
     ...(descendant?.collectionDefinitions || []).map(
@@ -16644,17 +16643,16 @@ function compareTieFormats({
     Object.keys(descendantCollectionDefinitions)
   );
   descendantDifferences.collectionsValue = getCollectionsValue(
-    descendantCollectionDefinitions,
-    descendantDifferences
+    descendantCollectionDefinitions
   );
   ancestorDifferences.collectionsValue = getCollectionsValue(
-    ancestorCollectionDefinitions,
-    ancestorDifferences
+    ancestorCollectionDefinitions
   );
   descendantDifferences.groupsCount = ancestor?.collectionGroups?.length ?? (0 - (descendant?.collectionGroups?.length ?? 0) || 0);
   ancestorDifferences.groupsCount = descendantDifferences.groupsCount ? -1 * descendantDifferences.groupsCount : 0;
   const valueDifference = descendantDifferences.collectionsValue.totalValue - ancestorDifferences.collectionsValue.totalValue;
   const matchUpCountDifference = descendantDifferences.collectionsValue.totalMatchUps - ancestorDifferences.collectionsValue.totalMatchUps;
+  const different = nameDifference || orderDifference || ancestorDesc !== descendantDesc || valueDifference !== 0;
   return {
     matchUpFormatDifferences,
     matchUpCountDifference,
@@ -16669,15 +16667,18 @@ function compareTieFormats({
     different
   };
 }
-function getCollectionsValue(definitions, aggregator) {
+function getCollectionsValue(definitions) {
   let totalMatchUps = 0;
-  const totalValue = aggregator.collectionIds.reduce((total, collectionId) => {
+  const collectionIds = Object.keys(definitions);
+  const totalValue = collectionIds.reduce((total, collectionId) => {
     const collectionDefinition = definitions[collectionId];
     const {
       collectionValueProfiles,
       collectionValue,
       matchUpCount,
-      matchUpValue
+      matchUpValue,
+      scoreValue,
+      setValue
     } = collectionDefinition;
     totalMatchUps += matchUpCount;
     if (collectionValueProfiles)
@@ -16685,9 +16686,16 @@ function getCollectionsValue(definitions, aggregator) {
         (total2, profile) => total2 + profile.value,
         0
       );
-    if (matchUpValue && matchUpCount)
-      return total + matchUpValue * matchUpCount;
-    return total + collectionValue;
+    if (matchUpCount) {
+      if (isConvertableInteger(matchUpValue))
+        return total + matchUpValue * matchUpCount;
+      if (isConvertableInteger(scoreValue))
+        return total + scoreValue * matchUpCount;
+      if (isConvertableInteger(setValue))
+        return total + setValue * matchUpCount;
+      return total + collectionValue;
+    }
+    return total;
   }, 0);
   return { totalValue, totalMatchUps };
 }
@@ -60246,6 +60254,7 @@ var lastNames = [
 	"Dallas",
 	"Diamond",
 	"Deckard",
+	"Dunbar",
 	"Earhart",
 	"Eisenstein",
 	"Eldritch",