tods-competition-factory 1.8.3 → 1.8.4

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

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.8.3';
+    return '1.8.4';
 }
 
 /******************************************************************************
@@ -625,10 +625,6 @@ function resolveTieFormat(_a) {
     };
 }
 
-function mustBeAnArray(value) {
-    return "".concat(value, " must be an array");
-}
-
 // returns only unique values within an array
 function unique(arr) {
     return arr.filter(function (item, i, s) { return s.lastIndexOf(item) === i; });
@@ -1446,10 +1442,18 @@ var INVALID_CONFIGURATION = {
     message: 'Invalid configuration',
     code: 'ERR_INVALID_CONFIG',
 };
+var INVALID_COLLECTION_DEFINITION = {
+    message: 'Invalid collectionDefinition',
+    code: 'ERR_INVALID_COLLECTION_DEFINITION',
+};
 var INVALID_OBJECT = {
     message: 'Invalid object',
     code: 'ERR_INVALID_OBJECT',
 };
+var INVALID_CATEGORY = {
+    message: 'Invalid category',
+    code: 'ERR_INVALID_CATEGORY',
+};
 var INVALID_VALUES = {
     message: 'Invalid values',
     code: 'ERR_INVALID_VALUES',
@@ -1550,6 +1554,8 @@ var errorConditionConstants = {
     INVALID_ACTION: INVALID_ACTION,
     INVALID_ASSIGNMENT: INVALID_ASSIGNMENT,
     INVALID_BOOKINGS: INVALID_BOOKINGS,
+    INVALID_CATEGORY: INVALID_CATEGORY,
+    INVALID_COLLECTION_DEFINITION: INVALID_COLLECTION_DEFINITION,
     INVALID_CONFIGURATION: INVALID_CONFIGURATION,
     INVALID_DATE_AVAILABILITY: INVALID_DATE_AVAILABILITY,
     INVALID_DATE: INVALID_DATE,
@@ -2004,6 +2010,9 @@ function setTournamentId(tournamentId) {
 function removeTournamentRecord(tournamentId) {
     return _globalStateProvider.removeTournamentRecord(tournamentId);
 }
+function getProvider() {
+    return _globalStateProvider;
+}
 function handleCaughtError(_a) {
     var engineName = _a.engineName, methodName = _a.methodName, params = _a.params, err = _a.err;
     var caughtErrorHandler = (typeof _globalStateProvider.handleCaughtError === 'function' &&
@@ -2371,6 +2380,8 @@ iteration // escape hatch - check against iteration threshold
 ) {
     var e_1, _a;
     if (iteration === void 0) { iteration = 0; }
+    if (getProvider().makeDeepCopy)
+        return getProvider().makeDeepCopy(sourceObject, convertExtensions, internalUse, removeExtensions);
     var deepCopy = deepCopyEnabled();
     var _b = deepCopy || {}, stringify = _b.stringify, toJSON = _b.toJSON, ignore = _b.ignore, modulate = _b.modulate;
     if ((!(deepCopy === null || deepCopy === void 0 ? void 0 : deepCopy.enabled) && !internalUse) ||
@@ -2626,6 +2637,203 @@ function generateHashCode(o) {
     return [str.length, keyCount, charSum].map(function (e) { return e.toString(36); }).join('');
 }
 
+var typeMatch = function (arr, type) {
+    return arr.filter(Boolean).every(function (i) { return typeof i === type; });
+};
+var allNumeric = function (arr) { return arr.filter(Boolean).every(isNumeric); };
+function getCategoryAgeDetails(params) {
+    var _a, _b;
+    var category = params.category;
+    if (typeof category !== 'object')
+        return { error: INVALID_CATEGORY };
+    var ageCategoryCode = category.ageCategoryCode, ageMaxDate = category.ageMaxDate, ageMinDate = category.ageMinDate, ageMax = category.ageMax, ageMin = category.ageMin;
+    var categoryName = category.categoryName;
+    var combinedAge;
+    if (!typeMatch([ageCategoryCode, ageMaxDate, ageMinDate, categoryName], 'string') ||
+        !allNumeric([ageMax, ageMin] ||
+            ![ageMaxDate, ageMinDate].filter(Boolean).every(isValidDateString)))
+        return { error: INVALID_CATEGORY };
+    var consideredDate = (_a = params.consideredDate) !== null && _a !== void 0 ? _a : extractDate(new Date().toLocaleDateString('sv'));
+    if (!isValidDateString(consideredDate))
+        return { error: INVALID_DATE };
+    // const [consideredYear, month, day] = consideredDate
+    var _c = __read(consideredDate
+        .split('-')
+        .slice(0, 3)
+        .map(function (n) { return parseInt(n); }), 1), consideredYear = _c[0];
+    // const monthDay = `${zeroPad(month)}-${zeroPad(day)}`;
+    var previousDayDate = dateStringDaysChange(consideredDate, -1);
+    var _d = __read(previousDayDate
+        .split('-')
+        .slice(1, 3)
+        .map(function (n) { return parseInt(n); }), 2), previousDayMonth = _d[0], previousDay = _d[1];
+    var previousMonthDay = "".concat(zeroPad(previousDayMonth), "-").concat(zeroPad(previousDay));
+    var nextDayDate = dateStringDaysChange(consideredDate, 1);
+    var _e = __read(nextDayDate
+        .split('-')
+        .slice(1, 3)
+        .map(function (n) { return parseInt(n); }), 2), nextDayMonth = _e[0], nextDay = _e[1];
+    var nextMonthDay = "".concat(zeroPad(nextDayMonth), "-").concat(zeroPad(nextDay));
+    var calculatedAgeMaxDate = ageMin && dateStringDaysChange(consideredDate, -1 * 365 * ageMin);
+    var calculatedAgeMinDate = ageMax && dateStringDaysChange(consideredDate, -1 * 365 * ageMax);
+    // collect errors; e.g. provided ageMin does not equal calculated ageMin
+    var errors = [];
+    var addError = function (errorString) {
+        return !errors.includes(errorString) && errors.push(errorString);
+    };
+    ageCategoryCode = ageCategoryCode !== null && ageCategoryCode !== void 0 ? ageCategoryCode : categoryName;
+    var prePost = /^([UO]?)(\d{1,2})([UO]?)$/;
+    var extractCombined = /^C(\d{1,2})-(\d{1,2})$/;
+    var isBetween = ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.includes('-');
+    var isCombined = isBetween && (ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.match(extractCombined));
+    var isCoded = ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.match(prePost);
+    // construct min or max date with or without year
+    //const isYYMM = (datePart) => datePart.match(/^\d{2}-\d{2}$/);
+    var constructedDate = function (y, df) { return "".concat(y, "-").concat(df); };
+    var uPre = function (ageInt) {
+        var ageMinYear = consideredYear - ageInt;
+        var newMinDate = constructedDate(ageMinYear, nextMonthDay);
+        if (category.ageMinDate && category.ageMinDate !== newMinDate)
+            addError("Invalid submitted ageMinDate: ".concat(ageMinDate));
+        ageMinDate = newMinDate;
+        if (ageCategoryCode) {
+            if (category.ageMax && category.ageMax !== ageInt - 1) {
+                addError("Invalid submitted ageMax: ".concat(ageMax));
+                calculatedAgeMinDate = undefined;
+            }
+            ageMax = ageInt - 1;
+        }
+    };
+    var uPost = function (ageInt) {
+        var ageMinYear = consideredYear - ageInt - 1;
+        var newMinDate = constructedDate(ageMinYear, nextMonthDay);
+        if (category.ageMin && category.ageMin > ageInt) {
+            addError("Invalid submitted ageMin: ".concat(ageMin));
+        }
+        if (category.ageMax && category.ageMax > ageInt) {
+            addError("Invalid submitted ageMax: ".concat(ageMax));
+        }
+        if (category.ageMinDate && category.ageMinDate !== newMinDate)
+            addError("Invalid submitted ageMinDate: ".concat(ageMinDate));
+        ageMinDate = newMinDate;
+        if (ageCategoryCode) {
+            if (category.ageMax && category.ageMax !== ageInt) {
+                addError("Invalid submitted ageMax: ".concat(ageMax));
+                calculatedAgeMaxDate = undefined;
+            }
+            ageMax = ageInt;
+        }
+    };
+    var oPre = function (ageInt) {
+        var ageMaxYear = consideredYear - ageInt;
+        var newMaxDate = constructedDate(ageMaxYear, previousMonthDay);
+        if (category.ageMaxDate && category.ageMaxDate !== newMaxDate)
+            addError("Invalid submitted ageMaxDate: ".concat(ageMaxDate));
+        ageMaxDate = newMaxDate;
+        if (ageCategoryCode) {
+            if (category.ageMin && category.ageMin !== ageInt + 1) {
+                addError("Invalid submitted ageMin: ".concat(ageMin));
+                calculatedAgeMaxDate = undefined;
+            }
+            ageMin = ageInt + 1;
+        }
+    };
+    var oPost = function (ageInt) {
+        var ageMaxYear = consideredYear - ageInt - 1;
+        var newMaxDate = constructedDate(ageMaxYear, previousMonthDay);
+        if (category.ageMaxDate && category.ageMaxDate !== newMaxDate)
+            addError("Invalid submitted ageMaxDate: ".concat(ageMaxDate));
+        ageMaxDate = newMaxDate;
+        if (ageCategoryCode) {
+            if (category.ageMin && category.ageMin !== ageInt) {
+                addError("Invalid submitted ageMin: ".concat(ageMin));
+                calculatedAgeMaxDate = undefined;
+            }
+            ageMin = ageInt;
+        }
+    };
+    var processCode = function (code) {
+        var _a = __read((code.match(prePost) || []).slice(1), 3), pre = _a[0], age = _a[1], post = _a[2];
+        var ageInt = parseInt(age);
+        if (pre === 'U') {
+            if (category.ageMaxDate && category.ageMaxDate !== ageMaxDate) {
+                addError("Invalid submitted ageMaxDate: ".concat(category.ageMaxDate));
+            }
+            uPre(ageInt);
+        }
+        else if (pre === 'O') {
+            oPre(ageInt);
+        }
+        if (post === 'U') {
+            if (category.ageMaxDate && category.ageMaxDate !== ageMaxDate) {
+                addError("Invalid submitted ageMaxDate: ".concat(category.ageMaxDate));
+            }
+            uPost(ageInt);
+        }
+        else if (post === 'O') {
+            oPost(ageInt);
+        }
+        ageMaxDate = ageMaxDate !== null && ageMaxDate !== void 0 ? ageMaxDate : calculatedAgeMaxDate;
+        ageMinDate = ageMinDate !== null && ageMinDate !== void 0 ? ageMinDate : calculatedAgeMinDate;
+    };
+    if (isCombined) {
+        // min and max birthdates are not relevant
+        // TODO: utility function to calculate combined age given two birthdates?
+        ageMaxDate = undefined;
+        ageMinDate = undefined;
+        ageMax = undefined;
+        ageMin = undefined;
+        if (category.ageMin) {
+            // calculate ageMaxDate
+            var ageMaxYear = consideredYear - category.ageMin;
+            ageMaxDate = constructedDate(ageMaxYear, previousMonthDay);
+        }
+        if (category.ageMax) {
+            // calculate ageMinDate
+            var ageMinYear = consideredYear - category.ageMax - 1;
+            ageMinDate = constructedDate(ageMinYear, nextMonthDay);
+        }
+        var _f = __read(((_b = ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.match(extractCombined)) !== null && _b !== void 0 ? _b : [])
+            .slice(1)
+            .map(function (n) { return parseInt(n); }), 2), lowAge = _f[0], highAge = _f[1];
+        if (lowAge <= highAge) {
+            ageMin = lowAge;
+            ageMax = highAge;
+            combinedAge = true;
+        }
+        else {
+            addError("Invalid combined age range ".concat(ageCategoryCode));
+        }
+    }
+    else if (isBetween) {
+        ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.split('-').forEach(processCode);
+    }
+    else if (isCoded) {
+        processCode(ageCategoryCode);
+    }
+    else {
+        if (ageMin)
+            oPre(ageMin);
+        if (ageMax)
+            uPost(ageMax);
+    }
+    if (ageMax && category.ageMin && category.ageMin > ageMax) {
+        addError("Invalid submitted ageMin: ".concat(category.ageMin));
+        ageMin = undefined;
+    }
+    var result = definedAttributes({
+        consideredDate: consideredDate,
+        combinedAge: combinedAge,
+        ageMaxDate: ageMaxDate,
+        ageMinDate: ageMinDate,
+        ageMax: ageMax,
+        ageMin: ageMin,
+    });
+    if (errors.length)
+        result.errors = errors;
+    return result;
+}
+
 // NOTE: type really does need to be any!
 function attributeFilter(params) {
     if (params === null)
@@ -2941,6 +3149,52 @@ function UUID() {
         lut[(d3 >> 24) & 0xff]);
 }
 
+function categoryCanContain(_a) {
+    var childCategory = _a.childCategory, withDetails = _a.withDetails, category = _a.category;
+    var categoryDetails = getCategoryAgeDetails({ category: category });
+    var childCategoryDetails = getCategoryAgeDetails({
+        category: childCategory,
+    });
+    var invalidAgeMin = childCategoryDetails.ageMin &&
+        ((categoryDetails.ageMin &&
+            childCategoryDetails.ageMin < categoryDetails.ageMin) ||
+            (categoryDetails.ageMax &&
+                childCategoryDetails.ageMin > categoryDetails.ageMax));
+    var invalidAgeMax = childCategoryDetails.ageMax &&
+        ((categoryDetails.ageMax &&
+            childCategoryDetails.ageMax > categoryDetails.ageMax) ||
+            (categoryDetails.ageMin &&
+                childCategoryDetails.ageMax < categoryDetails.ageMin));
+    var invalidAgeMinDate = childCategoryDetails.ageMinDate &&
+        categoryDetails.ageMaxDate &&
+        new Date(childCategoryDetails.ageMinDate) >
+            new Date(categoryDetails.ageMaxDate);
+    var invalidAgeMaxDate = childCategoryDetails.ageMaxDate &&
+        categoryDetails.ageMinDate &&
+        new Date(childCategoryDetails.ageMaxDate) <
+            new Date(categoryDetails.ageMinDate);
+    var valid = !invalidAgeMax &&
+        !invalidAgeMin &&
+        !invalidAgeMinDate &&
+        !invalidAgeMaxDate;
+    var ignoreFalse = true;
+    var result = definedAttributes({
+        valid: valid,
+        invalidAgeMax: invalidAgeMax,
+        invalidAgeMin: invalidAgeMin,
+        invalidAgeMinDate: invalidAgeMinDate,
+        invalidAgeMaxDate: invalidAgeMaxDate,
+    }, ignoreFalse);
+    if (withDetails) {
+        Object.assign(result, { categoryDetails: categoryDetails, childCategoryDetails: childCategoryDetails });
+    }
+    return result;
+}
+
+function mustBeAnArray(value) {
+    return "".concat(value, " must be an array");
+}
+
 function decorateResult(_a) {
     var context = _a.context, result = _a.result, stack = _a.stack, info = _a.info;
     if (result && !Array.isArray(result === null || result === void 0 ? void 0 : result.stack))
@@ -3522,6 +3776,7 @@ var SexEnum;
 
 function validateTieFormat(params) {
     var _a, _b, _c, _d;
+    var checkCategory = !!((params === null || params === void 0 ? void 0 : params.enforceCategory) !== false && (params === null || params === void 0 ? void 0 : params.category));
     var checkGender = !!((params === null || params === void 0 ? void 0 : params.enforceGender) !== false && (params === null || params === void 0 ? void 0 : params.gender));
     var checkCollectionIds = params === null || params === void 0 ? void 0 : params.checkCollectionIds;
     var tieFormat = params === null || params === void 0 ? void 0 : params.tieFormat;
@@ -3557,9 +3812,11 @@ function validateTieFormat(params) {
         if ((setValue || scoreValue) && !collectionValue)
             aggregateValueImperative = true;
         var _a = validateCollectionDefinition({
+            referenceCategory: params.category,
             referenceGender: params.gender,
             collectionDefinition: collectionDefinition,
             checkCollectionIds: checkCollectionIds,
+            checkCategory: checkCategory,
             checkGender: checkGender,
         }), valid = _a.valid, collectionDefinitionErrors = _a.errors;
         if (valid) {
@@ -3605,14 +3862,15 @@ function validateTieFormat(params) {
     return result;
 }
 function validateCollectionDefinition(_a) {
-    var collectionDefinition = _a.collectionDefinition, checkCollectionIds = _a.checkCollectionIds, _b = _a.checkGender, checkGender = _b === void 0 ? true : _b, referenceGender = _a.referenceGender, event = _a.event;
+    var _b = _a.checkCategory, checkCategory = _b === void 0 ? true : _b, collectionDefinition = _a.collectionDefinition, checkCollectionIds = _a.checkCollectionIds, _c = _a.checkGender, checkGender = _c === void 0 ? true : _c, referenceCategory = _a.referenceCategory, referenceGender = _a.referenceGender, event = _a.event;
     referenceGender = referenceGender !== null && referenceGender !== void 0 ? referenceGender : event === null || event === void 0 ? void 0 : event.gender;
+    var stack = 'validateCollectionDefinition';
     var errors = [];
     if (typeof collectionDefinition !== 'object') {
         errors.push("collectionDefinition must be an object: ".concat(collectionDefinition));
-        return { errors: errors, error: INVALID_OBJECT };
+        return decorateResult({ result: { errors: errors, error: INVALID_OBJECT }, stack: stack });
     }
-    var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionGroupNumber = collectionDefinition.collectionGroupNumber, collectionValue = collectionDefinition.collectionValue, collectionId = collectionDefinition.collectionId, matchUpCount = collectionDefinition.matchUpCount, matchUpFormat = collectionDefinition.matchUpFormat, matchUpValue = collectionDefinition.matchUpValue, matchUpType = collectionDefinition.matchUpType, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue, gender = collectionDefinition.gender;
+    var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionGroupNumber = collectionDefinition.collectionGroupNumber, collectionValue = collectionDefinition.collectionValue, collectionId = collectionDefinition.collectionId, matchUpCount = collectionDefinition.matchUpCount, matchUpFormat = collectionDefinition.matchUpFormat, matchUpValue = collectionDefinition.matchUpValue, matchUpType = collectionDefinition.matchUpType, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue, category = collectionDefinition.category, gender = collectionDefinition.gender;
     if (checkCollectionIds && typeof collectionId !== 'string') {
         errors.push("collectionId is not type string: ".concat(collectionId));
     }
@@ -3657,8 +3915,23 @@ function validateCollectionDefinition(_a) {
         referenceGender !== gender) {
         errors.push("Invalid gender: ".concat(gender));
     }
+    if (checkCategory && referenceCategory && category) {
+        var result = categoryCanContain({
+            category: referenceCategory,
+            childCategory: category,
+        });
+        if (!result.valid)
+            return decorateResult({
+                result: { error: INVALID_CATEGORY },
+                context: result,
+                stack: stack,
+            });
+    }
     if (errors.length)
-        return { errors: errors, error: INVALID_OBJECT };
+        return decorateResult({
+            result: { errors: errors, error: INVALID_COLLECTION_DEFINITION },
+            stack: stack,
+        });
     return { valid: true };
 }
 // add collectionIds if missing
@@ -19123,117 +19396,6 @@ var garman = {
     courtGenerator: courtGenerator,
 };
 
-var typeMatch = function (arr, type) {
-    return arr.filter(Boolean).every(function (i) { return typeof i === type; });
-};
-var allNumeric = function (arr) { return arr.filter(Boolean).every(isNumeric); };
-function parseAgeCategoryCode(_a) {
-    var _b;
-    var _c = _a === void 0 ? { consideredDate: '' } : _a, consideredDate = _c.consideredDate, category = _c.category;
-    var invalid = { error: INVALID_VALUES, ageMin: 8, ageMax: 99 };
-    if (typeof category !== 'object' || !isValidDateString(consideredDate))
-        return invalid;
-    var consideredYear = parseInt(consideredDate.split('-')[0]);
-    // collect errors; e.g. provided ageMin does not equal calculated ageMin
-    var errors = [];
-    var ageCategoryCode = category.ageCategoryCode, ageMaxDate = category.ageMaxDate, ageMinDate = category.ageMinDate, ageMax = category.ageMax, ageMin = category.ageMin;
-    var categoryName = category.categoryName;
-    var combinedAge;
-    if (!typeMatch([ageCategoryCode, ageMaxDate, ageMinDate, categoryName], 'string') ||
-        !allNumeric([ageMax, ageMin]))
-        return invalid;
-    ageCategoryCode = ageCategoryCode !== null && ageCategoryCode !== void 0 ? ageCategoryCode : categoryName;
-    var prePost = /^([UO]?)(\d{1,2})([UO]?)$/;
-    var extractCombined = /^C(\d{1,2})-(\d{1,2})$/;
-    var isBetween = ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.includes('-');
-    var isCombined = isBetween && (ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.match(extractCombined));
-    var isCoded = ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.match(prePost);
-    // construct min or max date with or without year
-    var isYYMM = function (datePart) { return datePart.match(/^\d{2}-\d{2}$/); };
-    var constructedDate = function (y, d, df) {
-        return (isValidDateString(d) && d) ||
-            (d && isYYMM(d) && "".concat(y, "-").concat(d)) ||
-            "".concat(y, "-").concat(df);
-    };
-    var uPre = function (ageInt) {
-        var ageMinYear = consideredYear - ageInt;
-        ageMinDate = constructedDate(ageMinYear, ageMinDate, '01-01');
-        if (ageMax && ageMax !== ageInt - 1)
-            errors.push("Invalid ageMax: ".concat(ageMax));
-        if (!ageMax)
-            ageMax = ageInt - 1;
-        return { ageMinDate: ageMinDate, ageMax: ageMax };
-    };
-    var uPost = function (ageInt) {
-        var ageMinYear = consideredYear - ageInt - 1;
-        ageMinDate = constructedDate(ageMinYear, ageMinDate, '01-01');
-        if (ageMax && ageMax !== ageInt)
-            errors.push("Invalid ageMax: ".concat(ageMax));
-        if (!ageMax)
-            ageMax = ageInt;
-        return { ageMinDate: ageMinDate, ageMax: ageMax };
-    };
-    var oPre = function (ageInt) {
-        var ageMaxYear = consideredYear - ageInt - 2;
-        ageMaxDate = constructedDate(ageMaxYear, ageMaxDate, '12-31');
-        if (ageMin && ageMin !== ageInt + 1)
-            errors.push("Invalid ageMin: ".concat(ageMin));
-        if (!ageMin)
-            ageMin = ageInt + 1;
-        return { ageMaxDate: ageMaxDate, ageMin: ageMin };
-    };
-    var oPost = function (ageInt) {
-        var ageMaxYear = consideredYear - ageInt - 1;
-        ageMaxDate = constructedDate(ageMaxYear, ageMaxDate, '12-31');
-        if (ageMin && ageMin !== ageInt)
-            errors.push("Invalid ageMin: ".concat(ageMin));
-        if (!ageMin)
-            ageMin = ageInt;
-        return { ageMaxDate: ageMaxDate, ageMin: ageMin };
-    };
-    var processCode = function (code) {
-        var _a, _b, _c, _d;
-        var _e = __read((code.match(prePost) || []).slice(1), 3), pre = _e[0], age = _e[1], post = _e[2];
-        var ageInt = parseInt(age);
-        if (pre === 'U')
-            (_a = uPre(ageInt), ageMinDate = _a.ageMinDate, ageMax = _a.ageMax);
-        if (post === 'U')
-            (_b = uPost(ageInt), ageMinDate = _b.ageMinDate, ageMax = _b.ageMax);
-        if (pre === 'O')
-            (_c = oPre(ageInt), ageMaxDate = _c.ageMaxDate, ageMin = _c.ageMin);
-        if (post === 'O')
-            (_d = oPost(ageInt), ageMaxDate = _d.ageMaxDate, ageMin = _d.ageMin);
-    };
-    if (isCombined) {
-        var _d = __read(((_b = ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.match(extractCombined)) !== null && _b !== void 0 ? _b : [])
-            .slice(1)
-            .map(function (n) { return parseInt(n); }), 2), lowAge = _d[0], highAge = _d[1];
-        if (lowAge <= highAge) {
-            ageMin = ageMin !== null && ageMin !== void 0 ? ageMin : lowAge;
-            ageMax = ageMax !== null && ageMax !== void 0 ? ageMax : highAge;
-            combinedAge = true;
-        }
-        else {
-            errors.push("Invalid combined age range ".concat(ageCategoryCode));
-        }
-    }
-    else if (isBetween) {
-        ageCategoryCode === null || ageCategoryCode === void 0 ? void 0 : ageCategoryCode.split('-').forEach(processCode);
-    }
-    else if (isCoded) {
-        processCode(ageCategoryCode);
-    }
-    if (errors.length)
-        return { error: errors, ageMin: 8, ageMax: 99 };
-    return definedAttributes({
-        combinedAge: combinedAge,
-        ageMaxDate: ageMaxDate,
-        ageMinDate: ageMinDate,
-        ageMax: ageMax,
-        ageMin: ageMin,
-    });
-}
-
 // utility function just to allow testing with string score entry
 function parseScoreString(_a) {
     var _b = _a.tiebreakTo, tiebreakTo = _b === void 0 ? 7 : _b, scoreString = _a.scoreString;
@@ -25199,16 +25361,19 @@ var structureTemplate = function (_a) {
     return structure;
 };
 
-function generateRoundRobin(_a) {
-    var _b = _a.structureName, structureName = _b === void 0 ? constantToString(MAIN) : _b, _c = _a.groupNameBase, groupNameBase = _c === void 0 ? 'Group' : _c, _d = _a.stageSequence, stageSequence = _d === void 0 ? 1 : _d, structureOptions = _a.structureOptions, appliedPolicies = _a.appliedPolicies, seedingProfile = _a.seedingProfile, _e = _a.stage, stage = _e === void 0 ? MAIN : _e, matchUpType = _a.matchUpType, roundTarget = _a.roundTarget, structureId = _a.structureId, drawSize = _a.drawSize, idPrefix = _a.idPrefix, isMock = _a.isMock, uuids = _a.uuids;
-    var _f = deriveGroups({
+function generateRoundRobin(params) {
+    var _a, _b, _c;
+    var _d = params.groupNameBase, groupNameBase = _d === void 0 ? 'Group' : _d, playoffAttributes = params.playoffAttributes, _e = params.stageSequence, stageSequence = _e === void 0 ? 1 : _e, structureOptions = params.structureOptions, appliedPolicies = params.appliedPolicies, seedingProfile = params.seedingProfile, _f = params.stage, stage = _f === void 0 ? MAIN : _f, matchUpType = params.matchUpType, roundTarget = params.roundTarget, structureId = params.structureId, groupNames = params.groupNames, drawSize = params.drawSize, idPrefix = params.idPrefix, isMock = params.isMock, uuids = params.uuids;
+    var structureName = (_c = (_a = params.structureName) !== null && _a !== void 0 ? _a : (_b = playoffAttributes === null || playoffAttributes === void 0 ? void 0 : playoffAttributes['0']) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : constantToString(MAIN);
+    var _g = deriveGroups({
         structureOptions: structureOptions,
         appliedPolicies: appliedPolicies,
         drawSize: drawSize,
-    }), groupCount = _f.groupCount, groupSize = _f.groupSize;
+    }), groupCount = _g.groupCount, groupSize = _g.groupSize;
     var finishingPosition = WIN_RATIO;
     var maxRoundNumber;
     var structures = generateRange(1, groupCount + 1).map(function (structureOrder) {
+        var _a;
         var matchUps = roundRobinMatchUps({
             groupSize: groupSize,
             structureOrder: structureOrder,
@@ -25221,12 +25386,13 @@ function generateRoundRobin(_a) {
             var roundNumber = _a.roundNumber;
             return roundNumber;
         })), false));
+        var structureName = (_a = groupNames === null || groupNames === void 0 ? void 0 : groupNames[structureOrder - 1]) !== null && _a !== void 0 ? _a : "".concat(groupNameBase, " ").concat(structureOrder);
         return structureTemplate({
-            structureName: "".concat(groupNameBase, " ").concat(structureOrder),
             structureId: uuids === null || uuids === void 0 ? void 0 : uuids.pop(),
             structureType: ITEM,
             finishingPosition: finishingPosition,
             structureOrder: structureOrder,
+            structureName: structureName,
             matchUps: matchUps,
         });
     });
@@ -32864,24 +33030,32 @@ function removeCollectionDefinition(params) {
 function addCollectionDefinition$1(_a) {
     var e_1, _b, e_2, _c, _d, e_3, _e;
     var _f, _g, _h, _j, _k, _l, _m, _o;
-    var _p = _a.updateInProgressMatchUps, updateInProgressMatchUps = _p === void 0 ? true : _p, collectionDefinition = _a.collectionDefinition, tournamentRecord = _a.tournamentRecord, referenceGender = _a.referenceGender, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, enforceGender = _a.enforceGender, structureId = _a.structureId, matchUpId = _a.matchUpId, matchUp = _a.matchUp, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
+    var _p = _a.updateInProgressMatchUps, updateInProgressMatchUps = _p === void 0 ? true : _p, collectionDefinition = _a.collectionDefinition, referenceCategory = _a.referenceCategory, tournamentRecord = _a.tournamentRecord, enforceCategory = _a.enforceCategory, referenceGender = _a.referenceGender, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, enforceGender = _a.enforceGender, structureId = _a.structureId, matchUpId = _a.matchUpId, matchUp = _a.matchUp, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
     var stack = 'addCollectionDefinition';
     var appliedPolicies = (_f = getAppliedPolicies({
         tournamentRecord: tournamentRecord,
         drawDefinition: drawDefinition,
         event: event,
     }).appliedPolicies) !== null && _f !== void 0 ? _f : {};
+    var matchUpActionsPolicy = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS];
+    enforceCategory =
+        enforceCategory !== null && enforceCategory !== void 0 ? enforceCategory : (_g = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _g === void 0 ? void 0 : _g.enforceCategory;
     enforceGender =
-        enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_h = (_g = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) === null || _g === void 0 ? void 0 : _g.participants) === null || _h === void 0 ? void 0 : _h.enforceGender;
-    var checkGender = !!(enforceGender !== false && (event === null || event === void 0 ? void 0 : event.gender));
-    var _q = validateCollectionDefinition({
+        enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_h = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _h === void 0 ? void 0 : _h.enforceGender;
+    var checkCategory = !!((referenceCategory !== null && referenceCategory !== void 0 ? referenceCategory : event === null || event === void 0 ? void 0 : event.category) &&
+        enforceCategory !== false);
+    var checkGender = !!((referenceGender !== null && referenceGender !== void 0 ? referenceGender : event === null || event === void 0 ? void 0 : event.gender) &&
+        enforceGender !== false);
+    var validationResult = validateCollectionDefinition({
+        referenceCategory: referenceCategory !== null && referenceCategory !== void 0 ? referenceCategory : event === null || event === void 0 ? void 0 : event.category,
         collectionDefinition: collectionDefinition,
         referenceGender: referenceGender,
+        checkCategory: checkCategory,
         checkGender: checkGender,
         event: event,
-    }), valid = _q.valid, errors = _q.errors;
-    if (!valid) {
-        return decorateResult({ result: { error: INVALID_VALUES, errors: errors }, stack: stack });
+    });
+    if (validationResult.error) {
+        return decorateResult({ result: validationResult, stack: stack });
     }
     var result = !(matchUp === null || matchUp === void 0 ? void 0 : matchUp.tieFormat)
         ? getTieFormat$1({
@@ -32924,7 +33098,7 @@ function addCollectionDefinition$1(_a) {
     });
     // calculate new winCriteria for tieFormat
     // if existing winCriteria is aggregateValue, retain
-    var _r = calculateWinCriteria(tieFormat), aggregateValue = _r.aggregateValue, valueGoal = _r.valueGoal;
+    var _q = calculateWinCriteria(tieFormat), aggregateValue = _q.aggregateValue, valueGoal = _q.valueGoal;
     tieFormat.winCriteria = definedAttributes({ aggregateValue: aggregateValue, valueGoal: valueGoal });
     // if valueGoal has changed, force renaming of the tieFormat
     var originalValueGoal = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.valueGoal;
@@ -32950,13 +33124,13 @@ function addCollectionDefinition$1(_a) {
         event.tieFormat = prunedTieFormat;
         try {
             // all team matchUps in the event which do not have tieFormats and where draws/strucures do not have tieFormats should have matchUps added
-            for (var _s = __values((_k = event.drawDefinitions) !== null && _k !== void 0 ? _k : []), _t = _s.next(); !_t.done; _t = _s.next()) {
-                var drawDefinition_1 = _t.value;
+            for (var _r = __values((_k = event.drawDefinitions) !== null && _k !== void 0 ? _k : []), _s = _r.next(); !_s.done; _s = _r.next()) {
+                var drawDefinition_1 = _s.value;
                 if (drawDefinition_1.tieFormat)
                     continue;
                 try {
-                    for (var _u = (e_2 = void 0, __values((_l = drawDefinition_1.structures) !== null && _l !== void 0 ? _l : [])), _v = _u.next(); !_v.done; _v = _u.next()) {
-                        var structure_1 = _v.value;
+                    for (var _t = (e_2 = void 0, __values((_l = drawDefinition_1.structures) !== null && _l !== void 0 ? _l : [])), _u = _t.next(); !_u.done; _u = _t.next()) {
+                        var structure_1 = _u.value;
                         if (structure_1.tieFormat)
                             continue;
                         var result_1 = updateStructureMatchUps({
@@ -32973,7 +33147,7 @@ function addCollectionDefinition$1(_a) {
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_v && !_v.done && (_c = _u.return)) _c.call(_u);
+                        if (_u && !_u.done && (_c = _t.return)) _c.call(_t);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
@@ -32982,7 +33156,7 @@ function addCollectionDefinition$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_t && !_t.done && (_b = _s.return)) _b.call(_s);
+                if (_s && !_s.done && (_b = _r.return)) _b.call(_r);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -33045,8 +33219,8 @@ function addCollectionDefinition$1(_a) {
         // all team matchUps in the drawDefinition which do not have tieFormats and where strucures do not have tieFormats should have matchUps added
         drawDefinition.tieFormat = prunedTieFormat;
         try {
-            for (var _w = __values((_m = drawDefinition.structures) !== null && _m !== void 0 ? _m : []), _x = _w.next(); !_x.done; _x = _w.next()) {
-                var structure_2 = _x.value;
+            for (var _v = __values((_m = drawDefinition.structures) !== null && _m !== void 0 ? _m : []), _w = _v.next(); !_w.done; _w = _v.next()) {
+                var structure_2 = _w.value;
                 var result_3 = updateStructureMatchUps({
                     updateInProgressMatchUps: updateInProgressMatchUps,
                     collectionDefinition: collectionDefinition,
@@ -33061,7 +33235,7 @@ function addCollectionDefinition$1(_a) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_x && !_x.done && (_e = _w.return)) _e.call(_w);
+                if (_w && !_w.done && (_e = _v.return)) _e.call(_v);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -39966,6 +40140,7 @@ var POLICY_MATCHUP_ACTIONS_DEFAULT = (_a$2 = {},
             },
         ],
         participants: {
+            enforceCategory: true,
             enforceGender: true, // disallow placing FEMALEs in MALE events and vice versa
         },
         processCodes: {
@@ -43767,7 +43942,8 @@ function generatePlayoffStructures(params) {
     var attributeProfile = playoffAttributes === null || playoffAttributes === void 0 ? void 0 : playoffAttributes[exitProfile];
     var base = (playoffStructureNameBase && "".concat(playoffStructureNameBase, " ")) || '';
     var customNaming = (_a = playoffAttributes === null || playoffAttributes === void 0 ? void 0 : playoffAttributes[finishingPositionRange]) !== null && _a !== void 0 ? _a : finishingPositionNaming === null || finishingPositionNaming === void 0 ? void 0 : finishingPositionNaming[finishingPositionRange];
-    var structureName = (customNaming === null || customNaming === void 0 ? void 0 : customNaming.name) ||
+    var structureName = params.structureName ||
+        (customNaming === null || customNaming === void 0 ? void 0 : customNaming.name) ||
         ((attributeProfile === null || attributeProfile === void 0 ? void 0 : attributeProfile.name) &&
             (addNameBaseToAttributeName
                 ? "".concat(base).concat(attributeProfile === null || attributeProfile === void 0 ? void 0 : attributeProfile.name)
@@ -43908,12 +44084,16 @@ function feedInChampionship(params) {
         fmlc: fmlc,
     }), consolationMatchUps = _f.matchUps, roundsCount = _f.roundsCount;
     if (drawSize > 2) {
+        var name_1 = (_c = (_b = playoffAttributes === null || playoffAttributes === void 0 ? void 0 : playoffAttributes['0-1']) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : constantToString(CONSOLATION);
+        var structureName_1 = params.playoffStructureNameBase
+            ? "".concat(params.playoffStructureNameBase, " ").concat(name_1)
+            : name_1;
         var consolationStructure = structureTemplate({
-            structureName: (_c = (_b = playoffAttributes === null || playoffAttributes === void 0 ? void 0 : playoffAttributes['0-1']) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : constantToString(CONSOLATION),
             matchUps: consolationMatchUps,
             structureId: uuids === null || uuids === void 0 ? void 0 : uuids.pop(),
             stage: CONSOLATION,
             stageSequence: 1,
+            structureName: structureName_1,
             matchUpType: matchUpType,
         });
         structures.push(consolationStructure);
@@ -44051,8 +44231,9 @@ function processPlayoffGroups(_a) {
         else if ([COMPASS, OLYMPIC, PLAY_OFF].includes(playoffDrawType)) {
             var params_1 = {
                 playoffAttributes: (_j = playoffGroup.playoffAttributes) !== null && _j !== void 0 ? _j : playoffAttributes,
+                playoffStructureNameBase: playoffGroup.playoffStructureNameBase,
                 structureId: (_k = playoffGroup.structureId) !== null && _k !== void 0 ? _k : uuids === null || uuids === void 0 ? void 0 : uuids.pop(),
-                playoffStructureNameBase: structureName,
+                structureName: playoffGroup.structureName,
                 idPrefix: idPrefix && "".concat(idPrefix, "-po"),
                 addNameBaseToAttributeName: true,
                 finishingPositionOffset: finishingPositionOffset,
@@ -44108,7 +44289,9 @@ function processPlayoffGroups(_a) {
         ].includes(playoffDrawType)) {
             var uuidsFMLC = [uuids === null || uuids === void 0 ? void 0 : uuids.pop(), uuids === null || uuids === void 0 ? void 0 : uuids.pop()];
             var params_2 = {
+                playoffStructureNameBase: playoffGroup.playoffStructureNameBase,
                 structureId: (_s = playoffGroup.structureId) !== null && _s !== void 0 ? _s : uuids === null || uuids === void 0 ? void 0 : uuids.pop(),
+                playoffAttributes: playoffGroup.playoffAttributes,
                 idPrefix: idPrefix && "".concat(idPrefix, "-po"),
                 finishingPositionOffset: finishingPositionOffset,
                 uuids: uuidsFMLC,
@@ -44211,9 +44394,8 @@ function generateRoundRobinWithPlayOff(params) {
     var drawDefinition = params.drawDefinition, structureOptions = params.structureOptions, requireSequential = params.requireSequential;
     var mainDrawProperties = __assign(__assign({ structureName: constantToString(MAIN) }, params), { stage: MAIN }); // default structureName
     var _a = generateRoundRobin(mainDrawProperties), structures = _a.structures, groupCount = _a.groupCount, groupSize = _a.groupSize;
-    // TODO: test for and handle this situation
     if (groupCount < 1) {
-        console.log(INVALID_CONFIGURATION);
+        return { error: INVALID_CONFIGURATION };
     }
     // define a default playoff group if none specified
     var playoffGroups = (structureOptions === null || structureOptions === void 0 ? void 0 : structureOptions.playoffGroups) || [
@@ -63067,8 +63249,8 @@ function prepareStage(params) {
         }).scaledEntries;
         if (!(scaledEntries === null || scaledEntries === void 0 ? void 0 : scaledEntries.length) && seedByRanking) {
             var rankingScaleAttributes = {
-                scaleType: RANKING$1,
                 scaleName: categoryName || ageCategoryCode,
+                scaleType: RANKING$1,
                 eventType: eventType,
             };
             (scaledEntries = getScaledEntries({
@@ -66567,7 +66749,7 @@ function generatePersons(params) {
             shuffledPersons.push(person);
         });
     }
-    var _d = parseAgeCategoryCode({
+    var _d = getCategoryAgeDetails({
         consideredDate: consideredDate,
         category: category,
     }), ageMinDate = _d.ageMinDate, ageMaxDate = _d.ageMaxDate;
@@ -69645,7 +69827,8 @@ var utilities = {
     nextPowerOf2: nextPowerOf2,
     numericSort: numericSort,
     overlap: overlap,
-    parseAgeCategoryCode: parseAgeCategoryCode,
+    getCategoryAgeDetails: getCategoryAgeDetails,
+    categoryCanContain: categoryCanContain,
     randomMember: randomMember,
     randomPop: randomPop,
     shuffleArray: shuffleArray,