tods-competition-factory 1.8.4 → 1.8.6

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

@@ -15,9 +15,8 @@ var setTypes$1 = {
 function stringify(matchUpFormatObject, preserveRedundant) {
     if (typeof matchUpFormatObject !== 'object')
         return;
-    if (matchUpFormatObject.timed && !isNaN(matchUpFormatObject.minutes))
-        return timedSetFormat(matchUpFormatObject);
-    if (matchUpFormatObject.bestOf && matchUpFormatObject.setFormat)
+    if ((matchUpFormatObject.bestOf || matchUpFormatObject.exactly) &&
+        matchUpFormatObject.setFormat)
         return getSetFormat(matchUpFormatObject, preserveRedundant);
     return undefined;
 }
@@ -34,25 +33,27 @@ function timedSetFormat(matchUpFormatObject) {
 }
 function getSetFormat(matchUpFormatObject, preserveRedundant) {
     var _a;
-    var bestOfValue = getNumber$1(matchUpFormatObject.bestOf);
+    var bestOfValue = getNumber$1(matchUpFormatObject.bestOf) || undefined;
+    var exactly = getNumber$1(matchUpFormatObject.exactly) || undefined;
+    var setLimit = bestOfValue || exactly;
     if (((_a = matchUpFormatObject.setFormat) === null || _a === void 0 ? void 0 : _a.timed) &&
         matchUpFormatObject.simplified &&
-        bestOfValue === 1) {
+        setLimit === 1) {
         return timedSetFormat(matchUpFormatObject.setFormat);
     }
-    var bestOfCode = (bestOfValue && "".concat(SET).concat(bestOfValue)) || '';
+    var setLimitCode = (setLimit && "".concat(SET).concat(setLimit)) || '';
     var setCountValue = stringifySet(matchUpFormatObject.setFormat, preserveRedundant);
     var setCode = (setCountValue && "S:".concat(setCountValue)) || '';
     var finalSetCountValue = stringifySet(matchUpFormatObject.finalSetFormat, preserveRedundant);
-    var finalSetCode = (bestOfValue &&
-        bestOfValue > 1 &&
+    var finalSetCode = (setLimit &&
+        setLimit > 1 &&
         finalSetCountValue &&
         setCountValue !== finalSetCountValue && // don't include final set code if equivalent to other sets
         "F:".concat(finalSetCountValue)) ||
         '';
-    var valid = bestOfCode && setCountValue;
+    var valid = setLimitCode && setCountValue;
     if (valid) {
-        return [bestOfCode, setCode, finalSetCode].filter(function (f) { return f; }).join('-');
+        return [setLimitCode, setCode, finalSetCode].filter(function (f) { return f; }).join('-');
     }
     return undefined;
 }
@@ -190,181 +191,6 @@ function skewedDistribution(min, max, skew, step, significantDecimals) {
     return parseFloat(num.toFixed(significantDecimals));
 }
 
-function parse(matchUpFormatCode) {
-    if (typeof matchUpFormatCode === 'string') {
-        var type = (matchUpFormatCode.startsWith('T') && TIMED) ||
-            (matchUpFormatCode.startsWith(SET) && SET) ||
-            '';
-        if (type === TIMED) {
-            var setFormat = parseTimedSet(matchUpFormatCode);
-            var parsedFormat = {
-                simplified: true,
-                setFormat: setFormat,
-                bestOf: 1,
-            };
-            if (parsedFormat.setFormat)
-                return parsedFormat;
-        }
-        if (type === SET)
-            return setsMatch(matchUpFormatCode);
-    }
-    return undefined;
-}
-function setsMatch(formatstring) {
-    var parts = formatstring.split('-');
-    var bestOf = getNumber(parts[0].slice(3));
-    var setFormat = parts && parseSetFormat(parts[1]);
-    var finalSetFormat = parts && parseSetFormat(parts[2]);
-    var validBestOf = bestOf && bestOf < 6;
-    var validFinalSet = !parts[2] || finalSetFormat;
-    var validSetsFormat = setFormat;
-    var result = { bestOf: bestOf, setFormat: setFormat };
-    if (finalSetFormat)
-        result.finalSetFormat = finalSetFormat;
-    if (validBestOf && validSetsFormat && validFinalSet)
-        return result;
-}
-function parseSetFormat(formatstring) {
-    if ((formatstring === null || formatstring === void 0 ? void 0 : formatstring[1]) === ':') {
-        var parts = formatstring.split(':');
-        var setType = setTypes$1[parts[0]];
-        var setFormatString = parts[1];
-        if (setType && setFormatString) {
-            var isTiebreakSet = setFormatString.indexOf('TB') === 0;
-            if (isTiebreakSet) {
-                var tiebreakSet = parseTiebreakFormat(setFormatString);
-                if (tiebreakSet === false)
-                    return false;
-                return typeof tiebreakSet === 'object' ? { tiebreakSet: tiebreakSet } : undefined;
-            }
-            var timedSet = setFormatString.indexOf('T') === 0;
-            if (timedSet)
-                return parseTimedSet(setFormatString);
-            var parts_1 = formatstring.match(/^[FS]:(\d+)([A-Za-z]*)/);
-            var NoAD = (parts_1 && isNoAD(parts_1[2])) || false;
-            var validNoAD = !(parts_1 === null || parts_1 === void 0 ? void 0 : parts_1[2]) || NoAD;
-            var setTo = parts_1 ? getNumber(parts_1[1]) : undefined;
-            var tiebreakAtValue = parseTiebreakAt(setFormatString);
-            var validTiebreakAt = tiebreakAtValue !== false;
-            var tiebreakAt = (validTiebreakAt && tiebreakAtValue) || setTo;
-            var tiebreakFormat = parseTiebreakFormat(setFormatString.split('/')[1]);
-            var validTiebreak = tiebreakFormat !== false;
-            var result = { setTo: setTo };
-            if (NoAD)
-                result.NoAD = true;
-            if (tiebreakFormat) {
-                result.tiebreakFormat = tiebreakFormat;
-                result.tiebreakAt = tiebreakAt;
-            }
-            else {
-                result.noTiebreak = true;
-            }
-            return ((setTo && validNoAD && validTiebreak && validTiebreakAt && result) ||
-                false);
-        }
-    }
-    return undefined;
-}
-function parseTiebreakAt(setFormatString, expectNumber) {
-    if (expectNumber === void 0) { expectNumber = true; }
-    var tiebreakAtValue = (setFormatString === null || setFormatString === void 0 ? void 0 : setFormatString.indexOf('@')) > 0 && setFormatString.split('@');
-    if (tiebreakAtValue) {
-        var tiebreakAt = expectNumber
-            ? getNumber(tiebreakAtValue[1])
-            : tiebreakAtValue[1];
-        return tiebreakAt || false;
-    }
-    return undefined;
-}
-function parseTiebreakFormat(formatstring) {
-    if (formatstring) {
-        if (formatstring.startsWith('TB')) {
-            var modifier = parseTiebreakAt(formatstring, false);
-            var parts = formatstring.match(/^TB(\d+)([A-Za-z]*)/);
-            var tiebreakToString = parts === null || parts === void 0 ? void 0 : parts[1];
-            var NoAD = parts && isNoAD(parts[2]);
-            var validNoAD = !(parts === null || parts === void 0 ? void 0 : parts[2]) || NoAD;
-            var tiebreakTo = getNumber(tiebreakToString);
-            if (tiebreakTo && validNoAD) {
-                var result = { tiebreakTo: tiebreakTo };
-                // modifiers cannot be numeric
-                if (modifier &&
-                    typeof modifier === 'string' &&
-                    !isConvertableInteger(modifier)) {
-                    result.modifier = modifier;
-                }
-                if (NoAD)
-                    result.NoAD = true;
-                return result;
-            }
-            else {
-                return false;
-            }
-        }
-        else {
-            return false;
-        }
-    }
-    return undefined;
-}
-function parseTimedSet(formatstring) {
-    var _a;
-    var timestring = formatstring.slice(1);
-    var parts = timestring.match(/^(\d+)(@?[A-Za-z]*)/);
-    var minutes = getNumber(parts === null || parts === void 0 ? void 0 : parts[1]);
-    if (!minutes)
-        return;
-    var setFormat = { timed: true, minutes: minutes };
-    var based = parts === null || parts === void 0 ? void 0 : parts[2];
-    var validModifier = [undefined, 'P', 'G'].includes(based);
-    if (based && !validModifier) {
-        var modifier = (_a = timestring.match(/^(\d+)(@)([A-Za-z]+)$/)) === null || _a === void 0 ? void 0 : _a[3];
-        if (modifier) {
-            setFormat.modifier = modifier;
-            return setFormat;
-        }
-        return;
-    }
-    if (based)
-        setFormat.based = parts[2];
-    return setFormat;
-}
-function isNoAD(formatstring) {
-    return formatstring && formatstring.indexOf(NOAD) >= 0;
-}
-function getNumber(formatstring) {
-    return !isNaN(Number(formatstring)) ? Number(formatstring) : 0;
-}
-
-function isValid(matchUpFormat) {
-    if (typeof matchUpFormat !== 'string')
-        return false;
-    var parsedFormat = parse(matchUpFormat);
-    var setParts = matchUpFormat.match(/-S:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/);
-    var setsTo = setParts === null || setParts === void 0 ? void 0 : setParts[1];
-    var tiebreakTo = setParts === null || setParts === void 0 ? void 0 : setParts[2];
-    var tiebreakAt = setParts === null || setParts === void 0 ? void 0 : setParts[3];
-    var finalSetParts = matchUpFormat.match(/-F:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/);
-    var finalSetTo = finalSetParts === null || finalSetParts === void 0 ? void 0 : finalSetParts[1];
-    var finalSetTiebreakTo = finalSetParts === null || finalSetParts === void 0 ? void 0 : finalSetParts[2];
-    var finalTiebreakAt = finalSetParts === null || finalSetParts === void 0 ? void 0 : finalSetParts[3];
-    var preserveRedundant = !!((setParts && tiebreakTo && setsTo === tiebreakAt) ||
-        (finalSetParts && finalSetTiebreakTo && finalSetTo === finalTiebreakAt));
-    var stringified = stringify(parsedFormat, preserveRedundant);
-    return stringified === matchUpFormat;
-}
-
-var matchUpFormatCode = {
-    isValidMatchUpFormat: isValid,
-    stringify: stringify,
-    isValid: isValid,
-    parse: parse,
-};
-
-function factoryVersion() {
-    return '1.8.4';
-}
-
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -566,65 +392,6 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-function getObjectTieFormat(obj) {
-    if (!obj)
-        return;
-    var tieFormatId = obj.tieFormatId, tieFormats = obj.tieFormats;
-    if (obj.tieFormat) {
-        return obj.tieFormat;
-    }
-    else if (tieFormatId && Array.isArray(tieFormats)) {
-        return tieFormats.find(function (tf) { return tf.tieFormatId === tieFormatId; });
-    }
-}
-
-function getItemTieFormat(_a) {
-    var _b, _c, _d;
-    var item = _a.item, drawDefinition = _a.drawDefinition, structure = _a.structure, event = _a.event;
-    if (!item)
-        return;
-    if (item.tieFormat)
-        return item.tieFormat;
-    // if there is a tieFormatId, only possible to look for referenced tieFormat in tieFormats on drawDefinition and event
-    if (item.tieFormatId) {
-        if (drawDefinition.tieFormat)
-            return drawDefinition.tieFormat;
-        var tieFormat = (_b = drawDefinition.tieFormats) === null || _b === void 0 ? void 0 : _b.find(function (tf) { return item.tieFormatId === tf.tieFormatId; });
-        if (tieFormat)
-            return tieFormat;
-        if (event.tieFormat)
-            return event.tieFormat;
-        return (_c = event.tieFormats) === null || _c === void 0 ? void 0 : _c.find(function (tf) { return item.tieFormatId === tf.tieFormatId; });
-    }
-    if (structure.tieFormat)
-        return structure.tieFormat;
-    if (structure.tieFormatId) {
-        var structureTieFormat = (_d = drawDefinition.tieFormats) === null || _d === void 0 ? void 0 : _d.find(function (tf) { return structure.tieFormatId === tf.tieFormatId; });
-        if (structureTieFormat)
-            return structureTieFormat;
-    }
-}
-
-function resolveTieFormat(_a) {
-    var drawDefinition = _a.drawDefinition, structure = _a.structure, matchUp = _a.matchUp, event = _a.event;
-    return {
-        tieFormat: getItemTieFormat({
-            item: matchUp,
-            drawDefinition: drawDefinition,
-            structure: structure,
-            event: event,
-        }) ||
-            getItemTieFormat({
-                item: structure,
-                drawDefinition: drawDefinition,
-                structure: structure,
-                event: event,
-            }) ||
-            getObjectTieFormat(drawDefinition) ||
-            getObjectTieFormat(event),
-    };
-}
-
 // returns only unique values within an array
 function unique(arr) {
     return arr.filter(function (item, i, s) { return s.lastIndexOf(item) === i; });
@@ -2637,6 +2404,562 @@ function generateHashCode(o) {
     return [str.length, keyCount, charSum].map(function (e) { return e.toString(36); }).join('');
 }
 
+// NOTE: type really does need to be any!
+function attributeFilter(params) {
+    if (params === null)
+        return {};
+    var _a = params || {}, source = _a.source, template = _a.template;
+    if (!template)
+        return source;
+    var target = {};
+    attributeCopy(source, template, target);
+    return target;
+    function attributeCopy(valuesObject, templateObject, outputObject) {
+        var e_1, _a;
+        if (!valuesObject || !templateObject)
+            return undefined;
+        var vKeys = Object.keys(valuesObject);
+        var oKeys = Object.keys(templateObject);
+        // the orMap allows spcification of { 'a||b': boolean } so that filter templates can apply to multiple attributes
+        var orMap = Object.assign.apply(Object, __spreadArray([{}], __read(oKeys
+            .filter(function (key) { return key.indexOf('||'); })
+            .map(function (key) { return key.split('||').map(function (or) {
+            var _a;
+            return (_a = {}, _a[or] = key, _a);
+        }); })
+            .flat()), false));
+        var allKeys = oKeys.concat.apply(oKeys, __spreadArray([], __read(Object.keys(orMap)), false));
+        var wildcard = allKeys.includes('*');
+        var _loop_1 = function (vKey) {
+            if (allKeys.indexOf(vKey) >= 0 || wildcard) {
+                var templateKey = orMap[vKey] || vKey;
+                var tobj_1 = templateObject[templateKey] || wildcard;
+                var vobj = valuesObject[vKey];
+                if (typeof tobj_1 === 'object' &&
+                    typeof vobj !== 'function' &&
+                    !Array.isArray(tobj_1)) {
+                    if (Array.isArray(vobj)) {
+                        var mappedElements = vobj
+                            .map(function (arrayMember) {
+                            var target = {};
+                            var result = attributeCopy(arrayMember, tobj_1, target);
+                            return result !== false ? target : undefined;
+                        })
+                            .filter(Boolean);
+                        outputObject[vKey] = mappedElements;
+                    }
+                    else if (vobj) {
+                        outputObject[vKey] = {};
+                        attributeCopy(vobj, tobj_1, outputObject[vKey]);
+                    }
+                }
+                else {
+                    var value = valuesObject[vKey];
+                    var exclude = Array.isArray(tobj_1) && !tobj_1.includes(value);
+                    if (exclude)
+                        return { value: false };
+                    if (templateObject[vKey] ||
+                        (wildcard && templateObject[vKey] !== false)) {
+                        outputObject[vKey] = value;
+                    }
+                }
+            }
+        };
+        try {
+            for (var vKeys_1 = __values(vKeys), vKeys_1_1 = vKeys_1.next(); !vKeys_1_1.done; vKeys_1_1 = vKeys_1.next()) {
+                var vKey = vKeys_1_1.value;
+                var state_1 = _loop_1(vKey);
+                if (typeof state_1 === "object")
+                    return state_1.value;
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (vKeys_1_1 && !vKeys_1_1.done && (_a = vKeys_1.return)) _a.call(vKeys_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return undefined;
+    }
+}
+
+function generateTimeCode(index) {
+    if (index === void 0) { index = 0; }
+    var uidate = new Date();
+    uidate.setHours(uidate.getHours() + index);
+    return uidate.getTime().toString(36).slice(-6).toUpperCase();
+}
+
+function numericSort(a, b) {
+    return a - b;
+}
+
+/**
+ *
+ * @param {object[]} arrayOfJSON - JSON objects array
+ * @param {object} config - object which configures processing (see below)
+ * @returns {string} - joined by '\r\n' or specified line separator
+ *
+ * config {
+ *  {boolean} includeTransformAccessors, // transform accessors are included with columnAccessors
+ *  {string[]} columnAccessors, // [ 'includeThis', 'andThis' ]
+ *  {object} columnTransform, // e.g. { 'newColumnName': ['oldColumn1', 'oldColumn2' ]}
+ *  {object} columnMap, // e.g. { 'columnName': 'newColumnName' }
+ *  {object} valuesMap, // e.g. { 'columnName': { 'value1': 'mappedValue' }} // useful for mapping IDs
+ *  {array} sortOrder // e.g. ['columnName1', 'columnName2'] // determine order of csv columns
+ *  {object} context, // attributes which are to be added to all rows { 'columnName': 'value }
+ *  {string} delimiter, // defaults to '"'
+ *  {string} columnJoiner, // defaults to ',' // defines how CSV columns are joined
+ *  {string} rowJoiner, // defaults to '\r\n' // defines how CSV lines are joined
+ *  {string} keyJoiner, // defaults to '.' // defines how flattened column names are constructed
+ * }
+ *
+ * NOTE: `columnTransform` mapped array elements are sensitive to order and will resolve to the first matching value
+ * NOTE: `columnMap` should not contain new columnName(s) that are `columnTransform` keys
+ */
+function JSON2CSV(arrayOfJSON, config) {
+    if (config && typeof config !== 'object')
+        return INVALID_VALUES;
+    var _a = (config || {}).columnTransform, columnTransform = _a === void 0 ? {} : _a;
+    var _b = config || {}, includeTransformAccessors = _b.includeTransformAccessors, _c = _b.includeHeaderRow, includeHeaderRow = _c === void 0 ? true : _c, returnTransformedJSON = _b.returnTransformedJSON, removeEmptyColumns = _b.removeEmptyColumns, onlyHeaderRow = _b.onlyHeaderRow, _d = _b.columnAccessors, columnAccessors = _d === void 0 ? [] : _d, _e = _b.functionMap, functionMap = _e === void 0 ? {} : _e, _f = _b.columnMap, columnMap = _f === void 0 ? {} : _f, _g = _b.valuesMap, valuesMap = _g === void 0 ? {} : _g, _h = _b.context, context = _h === void 0 ? {} : _h, _j = _b.delimiter, delimiter = _j === void 0 ? '"' : _j, _k = _b.columnJoiner, columnJoiner = _k === void 0 ? ',' : _k, _l = _b.rowJoiner, rowJoiner = _l === void 0 ? '\r\n' : _l, _m = _b.keyJoiner, keyJoiner = _m === void 0 ? '.' : _m;
+    if (!Array.isArray(arrayOfJSON) ||
+        !Array.isArray(columnAccessors) ||
+        typeof context !== 'object' ||
+        typeof columnMap !== 'object' ||
+        typeof columnTransform !== 'object' ||
+        typeof functionMap !== 'object' ||
+        typeof valuesMap !== 'object' ||
+        typeof columnJoiner !== 'string' ||
+        typeof rowJoiner !== 'string' ||
+        typeof keyJoiner !== 'string' ||
+        typeof delimiter !== 'string')
+        return INVALID_VALUES;
+    // ensure all column transformers are arrays
+    columnTransform = Object.assign.apply(Object, __spreadArray([{}], __read(Object.keys(columnTransform)
+        .reverse() // reverse so that exported CSV columns are in the order as defined
+        .map(function (key) {
+        var _a;
+        return (_a = {},
+            _a[key] = Array.isArray(columnTransform[key])
+                ? columnTransform[key]
+                : [
+                    // ensure transform attributes are strings
+                    typeof columnTransform[key] === 'string' && columnTransform[key],
+                ].filter(Boolean),
+            _a);
+    })), false));
+    var flattened = arrayOfJSON
+        .filter(Boolean)
+        .map(function (obj) { return flattenJSON(obj, keyJoiner); });
+    var transformColumns = Object.values(columnTransform).flat();
+    if (includeTransformAccessors)
+        columnAccessors.push.apply(columnAccessors, __spreadArray([], __read(transformColumns), false));
+    var headerRow = flattened
+        .reduce(function (aggregator, row) {
+        return Object.keys(row).every(function (key) { return (!aggregator.includes(key) && aggregator.push(key)) || true; }) && aggregator;
+    }, [])
+        .filter(function (key) { return !(columnAccessors === null || columnAccessors === void 0 ? void 0 : columnAccessors.length) || columnAccessors.includes(key); });
+    var accessorMap = Object.assign.apply(Object, __spreadArray([{}], __read(Object.keys(columnTransform)
+        .reverse() // so that original order is preserved when later pushed
+        .map(function (transform) {
+        return columnTransform[transform]
+            .map(function (value) {
+            var _a;
+            return (_a = {}, _a[value] = transform, _a);
+        })
+            .flat();
+    })
+        .flat()), false));
+    var sortColumns = function (a, b) {
+        return !(config === null || config === void 0 ? void 0 : config.sortOrder)
+            ? 0
+            : (config.sortOrder.includes(a) &&
+                config.sortOrder.includes(b) &&
+                config.sortOrder.indexOf(a) - config.sortOrder.indexOf(b)) ||
+                (!config.sortOrder.includes(b) && -1);
+    };
+    var tranformedHeaderRow = headerRow
+        .reduce(function (def, key) {
+        var transform = accessorMap[key];
+        if (transform) {
+            if (!def.includes(transform))
+                def.push(transform);
+        }
+        else {
+            def.push(key);
+        }
+        return def;
+    }, [])
+        .sort(sortColumns);
+    Object.keys(columnMap).forEach(function (columnName) {
+        return !tranformedHeaderRow.includes(columnName) &&
+            tranformedHeaderRow.unshift(columnName);
+    });
+    Object.keys(columnTransform).forEach(function (columnName) {
+        return !tranformedHeaderRow.includes(columnName) &&
+            tranformedHeaderRow.unshift(columnName);
+    });
+    typeof context === 'object' &&
+        Object.keys(context).forEach(function (columnName) {
+            return !tranformedHeaderRow.includes(columnName) &&
+                tranformedHeaderRow.unshift(columnName);
+        });
+    var mappedHeaderRow = tranformedHeaderRow.map(function (key) { return columnMap[key] || key; });
+    if (onlyHeaderRow)
+        return [mappedHeaderRow];
+    var withDelimiter = function (value) { return "".concat(delimiter).concat(value).concat(delimiter); };
+    var columnValueCounts = [];
+    var processRow = function (row) {
+        return Object.values(tranformedHeaderRow.reduce(function (columnsMap, columnName, columnIndex) {
+            var _a;
+            var accessors = columnTransform[columnName];
+            var value = ((accessors === null || accessors === void 0 ? void 0 : accessors.length)
+                ? row[accessors.find(function (accessor) { return row[accessor]; })]
+                : row[columnName]) ||
+                (context === null || context === void 0 ? void 0 : context[columnName]) ||
+                '';
+            var mappedValue = ((_a = valuesMap[columnName]) === null || _a === void 0 ? void 0 : _a[value]) || value;
+            var fxValue = typeof functionMap[columnName] === 'function'
+                ? functionMap[columnName](mappedValue)
+                : mappedValue;
+            columnsMap[columnName] = withDelimiter(fxValue);
+            if (fxValue) {
+                columnValueCounts[columnIndex] =
+                    (columnValueCounts[columnIndex] || 0) + 1;
+            }
+            return columnsMap;
+        }, {}));
+    };
+    var flattenedRows = flattened.map(processRow);
+    var indicesToRemove = removeEmptyColumns &&
+        __spreadArray([], __read(columnValueCounts), false).map(function (count, index) { return !count && index; })
+            .filter(isNumeric)
+            .reverse();
+    if (indicesToRemove) {
+        var purge = function (row) {
+            return row.filter(function (_, index) { return !indicesToRemove.includes(index); });
+        };
+        flattenedRows = flattenedRows.map(purge);
+        mappedHeaderRow = purge(mappedHeaderRow);
+    }
+    var rows = flattenedRows.map(function (row) { return row.join(columnJoiner); });
+    if (returnTransformedJSON) {
+        return rows.map(function (row) {
+            var columnValues = row.split(columnJoiner);
+            return Object.assign.apply(Object, __spreadArray([{}], __read(columnValues.map(function (v, i) {
+                var _a;
+                return (_a = {}, _a[mappedHeaderRow[i]] = v, _a);
+            })), false));
+        });
+    }
+    return includeHeaderRow
+        ? __spreadArray([mappedHeaderRow.map(withDelimiter).join(columnJoiner)], __read(rows), false).join(rowJoiner)
+        : rows.join(rowJoiner);
+}
+function flattenJSON(obj, keyJoiner, path) {
+    if (keyJoiner === void 0) { keyJoiner = '.'; }
+    if (path === void 0) { path = []; }
+    return (typeof obj === 'object' &&
+        Object.keys(obj).reduce(function (result, key) {
+            if (typeof obj[key] !== 'object') {
+                result[path.concat(key).join(keyJoiner)] = obj[key];
+                return result;
+            }
+            return Object.assign(result, flattenJSON(obj[key], keyJoiner, path.concat(key)));
+        }, {}));
+}
+
+/*
+  based on an answer provided by Jeff Ward on StackOverflow; November 2019
+  https://stackoverflow.com/users/1026023/jeff-ward
+  https://stackoverflow.com/questions/105034/how-to-create-guid-uuid?rq=1
+*/
+/**
+ * generate a given number of UUIDs
+ *
+ * @param {number} count - number of UUIDs to generate
+ */
+function UUIDS(count) {
+    if (count === void 0) { count = 1; }
+    return generateRange(0, count).map(UUID);
+}
+function UUID() {
+    var lut = [];
+    for (var i = 0; i < 256; i++) {
+        lut[i] = (i < 16 ? '0' : '') + i.toString(16);
+    }
+    var d0 = (Math.random() * 0xffffffff) | 0;
+    var d1 = (Math.random() * 0xffffffff) | 0;
+    var d2 = (Math.random() * 0xffffffff) | 0;
+    var d3 = (Math.random() * 0xffffffff) | 0;
+    // eslint-disable-next-line no-mixed-operators
+    return (lut[d0 & 0xff] +
+        lut[(d0 >> 8) & 0xff] +
+        lut[(d0 >> 16) & 0xff] +
+        lut[(d0 >> 24) & 0xff] +
+        '-' +
+        // eslint-disable-next-line no-mixed-operators
+        lut[d1 & 0xff] +
+        lut[(d1 >> 8) & 0xff] +
+        '-' +
+        lut[((d1 >> 16) & 0x0f) | 0x40] +
+        lut[(d1 >> 24) & 0xff] +
+        '-' +
+        // eslint-disable-next-line no-mixed-operators
+        lut[(d2 & 0x3f) | 0x80] +
+        lut[(d2 >> 8) & 0xff] +
+        '-' +
+        lut[(d2 >> 16) & 0xff] +
+        lut[(d2 >> 24) & 0xff] +
+        // eslint-disable-next-line no-mixed-operators
+        lut[d3 & 0xff] +
+        lut[(d3 >> 8) & 0xff] +
+        lut[(d3 >> 16) & 0xff] +
+        lut[(d3 >> 24) & 0xff]);
+}
+
+function parse(matchUpFormatCode) {
+    if (typeof matchUpFormatCode === 'string') {
+        var type = (matchUpFormatCode.startsWith('T') && TIMED) ||
+            (matchUpFormatCode.startsWith(SET) && SET) ||
+            '';
+        if (type === TIMED) {
+            var setFormat = parseTimedSet(matchUpFormatCode);
+            var parsedFormat = {
+                simplified: true,
+                setFormat: setFormat,
+                bestOf: 1,
+            };
+            if (setFormat)
+                return parsedFormat;
+        }
+        if (type === SET)
+            return setsMatch(matchUpFormatCode);
+    }
+    return undefined;
+}
+function setsMatch(formatstring) {
+    var parts = formatstring.split('-');
+    var setsCount = getNumber(parts[0].slice(3));
+    var bestOf = setsCount === 1 || setsCount % 2 !== 0 ? setsCount : undefined;
+    var exactly = setsCount !== 1 && setsCount % 2 === 0 ? setsCount : undefined;
+    var setFormat = parts && parseSetFormat(parts[1]);
+    var finalSetFormat = parts && parseSetFormat(parts[2]);
+    var timed = (setFormat && setFormat.timed) || (finalSetFormat && finalSetFormat.timed);
+    var validSetsCount = (bestOf && bestOf < 6) || (timed && exactly);
+    var validFinalSet = !parts[2] || finalSetFormat;
+    var validSetsFormat = setFormat;
+    var result = definedAttributes({
+        setFormat: setFormat,
+        exactly: exactly,
+        bestOf: bestOf,
+    });
+    if (finalSetFormat)
+        result.finalSetFormat = finalSetFormat;
+    if (validSetsCount && validSetsFormat && validFinalSet)
+        return result;
+}
+function parseSetFormat(formatstring) {
+    if ((formatstring === null || formatstring === void 0 ? void 0 : formatstring[1]) === ':') {
+        var parts = formatstring.split(':');
+        var setType = setTypes$1[parts[0]];
+        var setFormatString = parts[1];
+        if (setType && setFormatString) {
+            var isTiebreakSet = setFormatString.indexOf('TB') === 0;
+            if (isTiebreakSet) {
+                var tiebreakSet = parseTiebreakFormat(setFormatString);
+                if (tiebreakSet === false)
+                    return false;
+                return typeof tiebreakSet === 'object' ? { tiebreakSet: tiebreakSet } : undefined;
+            }
+            var timedSet = setFormatString.indexOf('T') === 0;
+            if (timedSet)
+                return parseTimedSet(setFormatString);
+            var parts_1 = formatstring.match(/^[FS]:(\d+)([A-Za-z]*)/);
+            var NoAD = (parts_1 && isNoAD(parts_1[2])) || false;
+            var validNoAD = !(parts_1 === null || parts_1 === void 0 ? void 0 : parts_1[2]) || NoAD;
+            var setTo = parts_1 ? getNumber(parts_1[1]) : undefined;
+            var tiebreakAtValue = parseTiebreakAt(setFormatString);
+            var validTiebreakAt = tiebreakAtValue !== false;
+            var tiebreakAt = (validTiebreakAt && tiebreakAtValue) || setTo;
+            var tiebreakFormat = parseTiebreakFormat(setFormatString.split('/')[1]);
+            var validTiebreak = tiebreakFormat !== false;
+            var result = { setTo: setTo };
+            if (NoAD)
+                result.NoAD = true;
+            if (tiebreakFormat) {
+                result.tiebreakFormat = tiebreakFormat;
+                result.tiebreakAt = tiebreakAt;
+            }
+            else {
+                result.noTiebreak = true;
+            }
+            return ((setTo && validNoAD && validTiebreak && validTiebreakAt && result) ||
+                false);
+        }
+    }
+    return undefined;
+}
+function parseTiebreakAt(setFormatString, expectNumber) {
+    if (expectNumber === void 0) { expectNumber = true; }
+    var tiebreakAtValue = (setFormatString === null || setFormatString === void 0 ? void 0 : setFormatString.indexOf('@')) > 0 && setFormatString.split('@');
+    if (tiebreakAtValue) {
+        var tiebreakAt = expectNumber
+            ? getNumber(tiebreakAtValue[1])
+            : tiebreakAtValue[1];
+        return tiebreakAt || false;
+    }
+    return undefined;
+}
+function parseTiebreakFormat(formatstring) {
+    if (formatstring) {
+        if (formatstring.startsWith('TB')) {
+            var modifier = parseTiebreakAt(formatstring, false);
+            var parts = formatstring.match(/^TB(\d+)([A-Za-z]*)/);
+            var tiebreakToString = parts === null || parts === void 0 ? void 0 : parts[1];
+            var NoAD = parts && isNoAD(parts[2]);
+            var validNoAD = !(parts === null || parts === void 0 ? void 0 : parts[2]) || NoAD;
+            var tiebreakTo = getNumber(tiebreakToString);
+            if (tiebreakTo && validNoAD) {
+                var result = { tiebreakTo: tiebreakTo };
+                // modifiers cannot be numeric
+                if (modifier &&
+                    typeof modifier === 'string' &&
+                    !isConvertableInteger(modifier)) {
+                    result.modifier = modifier;
+                }
+                if (NoAD)
+                    result.NoAD = true;
+                return result;
+            }
+            else {
+                return false;
+            }
+        }
+        else {
+            return false;
+        }
+    }
+    return undefined;
+}
+function parseTimedSet(formatstring) {
+    var _a;
+    var timestring = formatstring.slice(1);
+    var parts = timestring.match(/^(\d+)(@?[A-Za-z]*)/);
+    var minutes = getNumber(parts === null || parts === void 0 ? void 0 : parts[1]);
+    if (!minutes)
+        return;
+    var setFormat = { timed: true, minutes: minutes };
+    var based = parts === null || parts === void 0 ? void 0 : parts[2];
+    var validModifier = [undefined, 'P', 'G'].includes(based);
+    if (based && !validModifier) {
+        var modifier = (_a = timestring.match(/^(\d+)(@)([A-Za-z]+)$/)) === null || _a === void 0 ? void 0 : _a[3];
+        if (modifier) {
+            setFormat.modifier = modifier;
+            return setFormat;
+        }
+        return;
+    }
+    if (based)
+        setFormat.based = parts[2];
+    return setFormat;
+}
+function isNoAD(formatstring) {
+    return formatstring && formatstring.indexOf(NOAD) >= 0;
+}
+function getNumber(formatstring) {
+    return !isNaN(Number(formatstring)) ? Number(formatstring) : 0;
+}
+
+function isValid(matchUpFormat) {
+    if (typeof matchUpFormat !== 'string')
+        return false;
+    var parsedFormat = parse(matchUpFormat);
+    var setParts = matchUpFormat.match(/-S:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/);
+    var setsTo = setParts === null || setParts === void 0 ? void 0 : setParts[1];
+    var tiebreakTo = setParts === null || setParts === void 0 ? void 0 : setParts[2];
+    var tiebreakAt = setParts === null || setParts === void 0 ? void 0 : setParts[3];
+    var finalSetParts = matchUpFormat.match(/-F:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/);
+    var finalSetTo = finalSetParts === null || finalSetParts === void 0 ? void 0 : finalSetParts[1];
+    var finalSetTiebreakTo = finalSetParts === null || finalSetParts === void 0 ? void 0 : finalSetParts[2];
+    var finalTiebreakAt = finalSetParts === null || finalSetParts === void 0 ? void 0 : finalSetParts[3];
+    var preserveRedundant = !!((setParts && tiebreakTo && setsTo === tiebreakAt) ||
+        (finalSetParts && finalSetTiebreakTo && finalSetTo === finalTiebreakAt));
+    var stringified = stringify(parsedFormat, preserveRedundant);
+    return stringified === matchUpFormat;
+}
+
+var matchUpFormatCode = {
+    isValidMatchUpFormat: isValid,
+    stringify: stringify,
+    isValid: isValid,
+    parse: parse,
+};
+
+function factoryVersion() {
+    return '1.8.6';
+}
+
+function getObjectTieFormat(obj) {
+    if (!obj)
+        return;
+    var tieFormatId = obj.tieFormatId, tieFormats = obj.tieFormats;
+    if (obj.tieFormat) {
+        return obj.tieFormat;
+    }
+    else if (tieFormatId && Array.isArray(tieFormats)) {
+        return tieFormats.find(function (tf) { return tf.tieFormatId === tieFormatId; });
+    }
+}
+
+function getItemTieFormat(_a) {
+    var _b, _c, _d;
+    var item = _a.item, drawDefinition = _a.drawDefinition, structure = _a.structure, event = _a.event;
+    if (!item)
+        return;
+    if (item.tieFormat)
+        return item.tieFormat;
+    // if there is a tieFormatId, only possible to look for referenced tieFormat in tieFormats on drawDefinition and event
+    if (item.tieFormatId) {
+        if (drawDefinition.tieFormat)
+            return drawDefinition.tieFormat;
+        var tieFormat = (_b = drawDefinition.tieFormats) === null || _b === void 0 ? void 0 : _b.find(function (tf) { return item.tieFormatId === tf.tieFormatId; });
+        if (tieFormat)
+            return tieFormat;
+        if (event.tieFormat)
+            return event.tieFormat;
+        return (_c = event.tieFormats) === null || _c === void 0 ? void 0 : _c.find(function (tf) { return item.tieFormatId === tf.tieFormatId; });
+    }
+    if (structure.tieFormat)
+        return structure.tieFormat;
+    if (structure.tieFormatId) {
+        var structureTieFormat = (_d = drawDefinition.tieFormats) === null || _d === void 0 ? void 0 : _d.find(function (tf) { return structure.tieFormatId === tf.tieFormatId; });
+        if (structureTieFormat)
+            return structureTieFormat;
+    }
+}
+
+function resolveTieFormat(_a) {
+    var drawDefinition = _a.drawDefinition, structure = _a.structure, matchUp = _a.matchUp, event = _a.event;
+    return {
+        tieFormat: getItemTieFormat({
+            item: matchUp,
+            drawDefinition: drawDefinition,
+            structure: structure,
+            event: event,
+        }) ||
+            getItemTieFormat({
+                item: structure,
+                drawDefinition: drawDefinition,
+                structure: structure,
+                event: event,
+            }) ||
+            getObjectTieFormat(drawDefinition) ||
+            getObjectTieFormat(event),
+    };
+}
+
 var typeMatch = function (arr, type) {
     return arr.filter(Boolean).every(function (i) { return typeof i === type; });
 };
@@ -2834,321 +3157,6 @@ function getCategoryAgeDetails(params) {
     return result;
 }
 
-// NOTE: type really does need to be any!
-function attributeFilter(params) {
-    if (params === null)
-        return {};
-    var _a = params || {}, source = _a.source, template = _a.template;
-    if (!template)
-        return source;
-    var target = {};
-    attributeCopy(source, template, target);
-    return target;
-    function attributeCopy(valuesObject, templateObject, outputObject) {
-        var e_1, _a;
-        if (!valuesObject || !templateObject)
-            return undefined;
-        var vKeys = Object.keys(valuesObject);
-        var oKeys = Object.keys(templateObject);
-        // the orMap allows spcification of { 'a||b': boolean } so that filter templates can apply to multiple attributes
-        var orMap = Object.assign.apply(Object, __spreadArray([{}], __read(oKeys
-            .filter(function (key) { return key.indexOf('||'); })
-            .map(function (key) { return key.split('||').map(function (or) {
-            var _a;
-            return (_a = {}, _a[or] = key, _a);
-        }); })
-            .flat()), false));
-        var allKeys = oKeys.concat.apply(oKeys, __spreadArray([], __read(Object.keys(orMap)), false));
-        var wildcard = allKeys.includes('*');
-        var _loop_1 = function (vKey) {
-            if (allKeys.indexOf(vKey) >= 0 || wildcard) {
-                var templateKey = orMap[vKey] || vKey;
-                var tobj_1 = templateObject[templateKey] || wildcard;
-                var vobj = valuesObject[vKey];
-                if (typeof tobj_1 === 'object' &&
-                    typeof vobj !== 'function' &&
-                    !Array.isArray(tobj_1)) {
-                    if (Array.isArray(vobj)) {
-                        var mappedElements = vobj
-                            .map(function (arrayMember) {
-                            var target = {};
-                            var result = attributeCopy(arrayMember, tobj_1, target);
-                            return result !== false ? target : undefined;
-                        })
-                            .filter(Boolean);
-                        outputObject[vKey] = mappedElements;
-                    }
-                    else if (vobj) {
-                        outputObject[vKey] = {};
-                        attributeCopy(vobj, tobj_1, outputObject[vKey]);
-                    }
-                }
-                else {
-                    var value = valuesObject[vKey];
-                    var exclude = Array.isArray(tobj_1) && !tobj_1.includes(value);
-                    if (exclude)
-                        return { value: false };
-                    if (templateObject[vKey] ||
-                        (wildcard && templateObject[vKey] !== false)) {
-                        outputObject[vKey] = value;
-                    }
-                }
-            }
-        };
-        try {
-            for (var vKeys_1 = __values(vKeys), vKeys_1_1 = vKeys_1.next(); !vKeys_1_1.done; vKeys_1_1 = vKeys_1.next()) {
-                var vKey = vKeys_1_1.value;
-                var state_1 = _loop_1(vKey);
-                if (typeof state_1 === "object")
-                    return state_1.value;
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (vKeys_1_1 && !vKeys_1_1.done && (_a = vKeys_1.return)) _a.call(vKeys_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return undefined;
-    }
-}
-
-function generateTimeCode(index) {
-    if (index === void 0) { index = 0; }
-    var uidate = new Date();
-    uidate.setHours(uidate.getHours() + index);
-    return uidate.getTime().toString(36).slice(-6).toUpperCase();
-}
-
-function numericSort(a, b) {
-    return a - b;
-}
-
-/**
- *
- * @param {object[]} arrayOfJSON - JSON objects array
- * @param {object} config - object which configures processing (see below)
- * @returns {string} - joined by '\r\n' or specified line separator
- *
- * config {
- *  {boolean} includeTransformAccessors, // transform accessors are included with columnAccessors
- *  {string[]} columnAccessors, // [ 'includeThis', 'andThis' ]
- *  {object} columnTransform, // e.g. { 'newColumnName': ['oldColumn1', 'oldColumn2' ]}
- *  {object} columnMap, // e.g. { 'columnName': 'newColumnName' }
- *  {object} valuesMap, // e.g. { 'columnName': { 'value1': 'mappedValue' }} // useful for mapping IDs
- *  {array} sortOrder // e.g. ['columnName1', 'columnName2'] // determine order of csv columns
- *  {object} context, // attributes which are to be added to all rows { 'columnName': 'value }
- *  {string} delimiter, // defaults to '"'
- *  {string} columnJoiner, // defaults to ',' // defines how CSV columns are joined
- *  {string} rowJoiner, // defaults to '\r\n' // defines how CSV lines are joined
- *  {string} keyJoiner, // defaults to '.' // defines how flattened column names are constructed
- * }
- *
- * NOTE: `columnTransform` mapped array elements are sensitive to order and will resolve to the first matching value
- * NOTE: `columnMap` should not contain new columnName(s) that are `columnTransform` keys
- */
-function JSON2CSV(arrayOfJSON, config) {
-    if (config && typeof config !== 'object')
-        return INVALID_VALUES;
-    var _a = (config || {}).columnTransform, columnTransform = _a === void 0 ? {} : _a;
-    var _b = config || {}, includeTransformAccessors = _b.includeTransformAccessors, _c = _b.includeHeaderRow, includeHeaderRow = _c === void 0 ? true : _c, returnTransformedJSON = _b.returnTransformedJSON, removeEmptyColumns = _b.removeEmptyColumns, onlyHeaderRow = _b.onlyHeaderRow, _d = _b.columnAccessors, columnAccessors = _d === void 0 ? [] : _d, _e = _b.functionMap, functionMap = _e === void 0 ? {} : _e, _f = _b.columnMap, columnMap = _f === void 0 ? {} : _f, _g = _b.valuesMap, valuesMap = _g === void 0 ? {} : _g, _h = _b.context, context = _h === void 0 ? {} : _h, _j = _b.delimiter, delimiter = _j === void 0 ? '"' : _j, _k = _b.columnJoiner, columnJoiner = _k === void 0 ? ',' : _k, _l = _b.rowJoiner, rowJoiner = _l === void 0 ? '\r\n' : _l, _m = _b.keyJoiner, keyJoiner = _m === void 0 ? '.' : _m;
-    if (!Array.isArray(arrayOfJSON) ||
-        !Array.isArray(columnAccessors) ||
-        typeof context !== 'object' ||
-        typeof columnMap !== 'object' ||
-        typeof columnTransform !== 'object' ||
-        typeof functionMap !== 'object' ||
-        typeof valuesMap !== 'object' ||
-        typeof columnJoiner !== 'string' ||
-        typeof rowJoiner !== 'string' ||
-        typeof keyJoiner !== 'string' ||
-        typeof delimiter !== 'string')
-        return INVALID_VALUES;
-    // ensure all column transformers are arrays
-    columnTransform = Object.assign.apply(Object, __spreadArray([{}], __read(Object.keys(columnTransform)
-        .reverse() // reverse so that exported CSV columns are in the order as defined
-        .map(function (key) {
-        var _a;
-        return (_a = {},
-            _a[key] = Array.isArray(columnTransform[key])
-                ? columnTransform[key]
-                : [
-                    // ensure transform attributes are strings
-                    typeof columnTransform[key] === 'string' && columnTransform[key],
-                ].filter(Boolean),
-            _a);
-    })), false));
-    var flattened = arrayOfJSON
-        .filter(Boolean)
-        .map(function (obj) { return flattenJSON(obj, keyJoiner); });
-    var transformColumns = Object.values(columnTransform).flat();
-    if (includeTransformAccessors)
-        columnAccessors.push.apply(columnAccessors, __spreadArray([], __read(transformColumns), false));
-    var headerRow = flattened
-        .reduce(function (aggregator, row) {
-        return Object.keys(row).every(function (key) { return (!aggregator.includes(key) && aggregator.push(key)) || true; }) && aggregator;
-    }, [])
-        .filter(function (key) { return !(columnAccessors === null || columnAccessors === void 0 ? void 0 : columnAccessors.length) || columnAccessors.includes(key); });
-    var accessorMap = Object.assign.apply(Object, __spreadArray([{}], __read(Object.keys(columnTransform)
-        .reverse() // so that original order is preserved when later pushed
-        .map(function (transform) {
-        return columnTransform[transform]
-            .map(function (value) {
-            var _a;
-            return (_a = {}, _a[value] = transform, _a);
-        })
-            .flat();
-    })
-        .flat()), false));
-    var sortColumns = function (a, b) {
-        return !(config === null || config === void 0 ? void 0 : config.sortOrder)
-            ? 0
-            : (config.sortOrder.includes(a) &&
-                config.sortOrder.includes(b) &&
-                config.sortOrder.indexOf(a) - config.sortOrder.indexOf(b)) ||
-                (!config.sortOrder.includes(b) && -1);
-    };
-    var tranformedHeaderRow = headerRow
-        .reduce(function (def, key) {
-        var transform = accessorMap[key];
-        if (transform) {
-            if (!def.includes(transform))
-                def.push(transform);
-        }
-        else {
-            def.push(key);
-        }
-        return def;
-    }, [])
-        .sort(sortColumns);
-    Object.keys(columnMap).forEach(function (columnName) {
-        return !tranformedHeaderRow.includes(columnName) &&
-            tranformedHeaderRow.unshift(columnName);
-    });
-    Object.keys(columnTransform).forEach(function (columnName) {
-        return !tranformedHeaderRow.includes(columnName) &&
-            tranformedHeaderRow.unshift(columnName);
-    });
-    typeof context === 'object' &&
-        Object.keys(context).forEach(function (columnName) {
-            return !tranformedHeaderRow.includes(columnName) &&
-                tranformedHeaderRow.unshift(columnName);
-        });
-    var mappedHeaderRow = tranformedHeaderRow.map(function (key) { return columnMap[key] || key; });
-    if (onlyHeaderRow)
-        return [mappedHeaderRow];
-    var withDelimiter = function (value) { return "".concat(delimiter).concat(value).concat(delimiter); };
-    var columnValueCounts = [];
-    var processRow = function (row) {
-        return Object.values(tranformedHeaderRow.reduce(function (columnsMap, columnName, columnIndex) {
-            var _a;
-            var accessors = columnTransform[columnName];
-            var value = ((accessors === null || accessors === void 0 ? void 0 : accessors.length)
-                ? row[accessors.find(function (accessor) { return row[accessor]; })]
-                : row[columnName]) ||
-                (context === null || context === void 0 ? void 0 : context[columnName]) ||
-                '';
-            var mappedValue = ((_a = valuesMap[columnName]) === null || _a === void 0 ? void 0 : _a[value]) || value;
-            var fxValue = typeof functionMap[columnName] === 'function'
-                ? functionMap[columnName](mappedValue)
-                : mappedValue;
-            columnsMap[columnName] = withDelimiter(fxValue);
-            if (fxValue) {
-                columnValueCounts[columnIndex] =
-                    (columnValueCounts[columnIndex] || 0) + 1;
-            }
-            return columnsMap;
-        }, {}));
-    };
-    var flattenedRows = flattened.map(processRow);
-    var indicesToRemove = removeEmptyColumns &&
-        __spreadArray([], __read(columnValueCounts), false).map(function (count, index) { return !count && index; })
-            .filter(isNumeric)
-            .reverse();
-    if (indicesToRemove) {
-        var purge = function (row) {
-            return row.filter(function (_, index) { return !indicesToRemove.includes(index); });
-        };
-        flattenedRows = flattenedRows.map(purge);
-        mappedHeaderRow = purge(mappedHeaderRow);
-    }
-    var rows = flattenedRows.map(function (row) { return row.join(columnJoiner); });
-    if (returnTransformedJSON) {
-        return rows.map(function (row) {
-            var columnValues = row.split(columnJoiner);
-            return Object.assign.apply(Object, __spreadArray([{}], __read(columnValues.map(function (v, i) {
-                var _a;
-                return (_a = {}, _a[mappedHeaderRow[i]] = v, _a);
-            })), false));
-        });
-    }
-    return includeHeaderRow
-        ? __spreadArray([mappedHeaderRow.map(withDelimiter).join(columnJoiner)], __read(rows), false).join(rowJoiner)
-        : rows.join(rowJoiner);
-}
-function flattenJSON(obj, keyJoiner, path) {
-    if (keyJoiner === void 0) { keyJoiner = '.'; }
-    if (path === void 0) { path = []; }
-    return (typeof obj === 'object' &&
-        Object.keys(obj).reduce(function (result, key) {
-            if (typeof obj[key] !== 'object') {
-                result[path.concat(key).join(keyJoiner)] = obj[key];
-                return result;
-            }
-            return Object.assign(result, flattenJSON(obj[key], keyJoiner, path.concat(key)));
-        }, {}));
-}
-
-/*
-  based on an answer provided by Jeff Ward on StackOverflow; November 2019
-  https://stackoverflow.com/users/1026023/jeff-ward
-  https://stackoverflow.com/questions/105034/how-to-create-guid-uuid?rq=1
-*/
-/**
- * generate a given number of UUIDs
- *
- * @param {number} count - number of UUIDs to generate
- */
-function UUIDS(count) {
-    if (count === void 0) { count = 1; }
-    return generateRange(0, count).map(UUID);
-}
-function UUID() {
-    var lut = [];
-    for (var i = 0; i < 256; i++) {
-        lut[i] = (i < 16 ? '0' : '') + i.toString(16);
-    }
-    var d0 = (Math.random() * 0xffffffff) | 0;
-    var d1 = (Math.random() * 0xffffffff) | 0;
-    var d2 = (Math.random() * 0xffffffff) | 0;
-    var d3 = (Math.random() * 0xffffffff) | 0;
-    // eslint-disable-next-line no-mixed-operators
-    return (lut[d0 & 0xff] +
-        lut[(d0 >> 8) & 0xff] +
-        lut[(d0 >> 16) & 0xff] +
-        lut[(d0 >> 24) & 0xff] +
-        '-' +
-        // eslint-disable-next-line no-mixed-operators
-        lut[d1 & 0xff] +
-        lut[(d1 >> 8) & 0xff] +
-        '-' +
-        lut[((d1 >> 16) & 0x0f) | 0x40] +
-        lut[(d1 >> 24) & 0xff] +
-        '-' +
-        // eslint-disable-next-line no-mixed-operators
-        lut[(d2 & 0x3f) | 0x80] +
-        lut[(d2 >> 8) & 0xff] +
-        '-' +
-        lut[(d2 >> 16) & 0xff] +
-        lut[(d2 >> 24) & 0xff] +
-        // eslint-disable-next-line no-mixed-operators
-        lut[d3 & 0xff] +
-        lut[(d3 >> 8) & 0xff] +
-        lut[(d3 >> 16) & 0xff] +
-        lut[(d3 >> 24) & 0xff]);
-}
-
 function categoryCanContain(_a) {
     var childCategory = _a.childCategory, withDetails = _a.withDetails, category = _a.category;
     var categoryDetails = getCategoryAgeDetails({ category: category });
@@ -8920,6 +8928,7 @@ function structureAssignedDrawPositions(_a) {
 }
 
 function getOrderedDrawPositions(_a) {
+    var _b;
     var drawPositions = _a.drawPositions, roundProfile = _a.roundProfile, roundNumber = _a.roundNumber;
     var unassignedDrawPositions = [undefined, undefined];
     if (noNumeric(drawPositions)) {
@@ -8930,9 +8939,9 @@ function getOrderedDrawPositions(_a) {
     }
     var targetRoundProfile = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber];
     var pairedDrawPositions = targetRoundProfile === null || targetRoundProfile === void 0 ? void 0 : targetRoundProfile.pairedDrawPositions;
-    var displayOrder = (pairedDrawPositions === null || pairedDrawPositions === void 0 ? void 0 : pairedDrawPositions.find(function (pair) {
+    var displayOrder = (_b = pairedDrawPositions === null || pairedDrawPositions === void 0 ? void 0 : pairedDrawPositions.find(function (pair) {
         return overlap(pair || [], drawPositions.filter(Boolean));
-    })) || unassignedDrawPositions;
+    })) !== null && _b !== void 0 ? _b : unassignedDrawPositions;
     // ############# IMPORTANT DO NOT CHANGE #################
     // when both present, drawPositions are always sorted numerically
     // this holds true even when fed positions encounter each other in later rounds
@@ -8942,7 +8951,7 @@ function getOrderedDrawPositions(_a) {
     // previous round lookback is provided by the roundProfile
     var isFeedRound = targetRoundProfile === null || targetRoundProfile === void 0 ? void 0 : targetRoundProfile.feedRound;
     if (allNumeric$1(drawPositions)) {
-        var orderedDrawPositions = drawPositions.sort(numericSort);
+        var orderedDrawPositions = __spreadArray([], __read(drawPositions), false).sort(numericSort);
         return {
             orderedDrawPositions: orderedDrawPositions.length === 2 ? orderedDrawPositions : displayOrder,
             displayOrder: isFeedRound ? orderedDrawPositions : displayOrder,
@@ -9723,9 +9732,9 @@ function getAllStructureMatchUps(_a) {
     }
     return { matchUps: matchUps, roundMatchUps: roundMatchUps, roundProfile: roundProfile, collectionPositionMatchUps: collectionPositionMatchUps };
     function addMatchUpContext(_a) {
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
         var scheduleVisibilityFilters = _a.scheduleVisibilityFilters, sourceDrawPositionRanges = _a.sourceDrawPositionRanges, drawPositionsRanges = _a.drawPositionsRanges, initialRoundOfPlay = _a.initialRoundOfPlay, additionalContext = _a.additionalContext, roundNamingProfile = _a.roundNamingProfile, tieDrawPositions = _a.tieDrawPositions, appliedPolicies = _a.appliedPolicies, isCollectionBye = _a.isCollectionBye, matchUpTieId = _a.matchUpTieId, isRoundRobin = _a.isRoundRobin, roundProfile = _a.roundProfile, sideLineUps = _a.sideLineUps, matchUp = _a.matchUp, event = _a.event;
-        additionalContext = additionalContext || {};
+        additionalContext = additionalContext !== null && additionalContext !== void 0 ? additionalContext : {};
         var tieFormat = (_b = resolveTieFormat({
             drawDefinition: drawDefinition,
             structure: structure,
@@ -9737,17 +9746,14 @@ function getAllStructureMatchUps(_a) {
             (collectionDefinitions === null || collectionDefinitions === void 0 ? void 0 : collectionDefinitions.find(function (definition) { return definition.collectionId === matchUp.collectionId; }));
         var matchUpFormat = matchUp.collectionId
             ? collectionDefinition === null || collectionDefinition === void 0 ? void 0 : collectionDefinition.matchUpFormat
-            : matchUp.matchUpFormat ||
-                (structure === null || structure === void 0 ? void 0 : structure.matchUpFormat) ||
-                (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.matchUpFormat) ||
-                (event === null || event === void 0 ? void 0 : event.matchUpFormat);
+            : (_e = (_d = (_c = matchUp.matchUpFormat) !== null && _c !== void 0 ? _c : structure === null || structure === void 0 ? void 0 : structure.matchUpFormat) !== null && _d !== void 0 ? _d : drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.matchUpFormat) !== null && _e !== void 0 ? _e : event === null || event === void 0 ? void 0 : event.matchUpFormat;
         var matchUpType = matchUp.matchUpType ||
             (collectionDefinition === null || collectionDefinition === void 0 ? void 0 : collectionDefinition.matchUpType) ||
             (structure === null || structure === void 0 ? void 0 : structure.matchUpType) ||
             (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.matchUpType) ||
             ((event === null || event === void 0 ? void 0 : event.eventType) !== TEAM$1 && (event === null || event === void 0 ? void 0 : event.eventType));
         var matchUpStatus = isCollectionBye ? BYE : matchUp.matchUpStatus;
-        var _t = getMatchUpScheduleDetails({
+        var _z = getMatchUpScheduleDetails({
             scheduleVisibilityFilters: scheduleVisibilityFilters,
             afterRecoveryTimes: afterRecoveryTimes,
             tournamentRecord: tournamentRecord,
@@ -9756,10 +9762,10 @@ function getAllStructureMatchUps(_a) {
             matchUpType: matchUpType,
             matchUp: matchUp,
             event: event,
-        }), schedule = _t.schedule, endDate = _t.endDate;
-        var drawPositions = (_c = tieDrawPositions !== null && tieDrawPositions !== void 0 ? tieDrawPositions : matchUp.drawPositions) !== null && _c !== void 0 ? _c : [];
+        }), schedule = _z.schedule, endDate = _z.endDate;
+        var drawPositions = (_f = tieDrawPositions !== null && tieDrawPositions !== void 0 ? tieDrawPositions : matchUp.drawPositions) !== null && _f !== void 0 ? _f : [];
         var collectionPosition = matchUp.collectionPosition, collectionId = matchUp.collectionId, roundPosition = matchUp.roundPosition;
-        var roundNumber = matchUp.roundNumber || additionalContext.roundNumber;
+        var roundNumber = (_g = matchUp.roundNumber) !== null && _g !== void 0 ? _g : additionalContext.roundNumber;
         var drawPositionCollectionAssignment = collectionId
             ? getDrawPositionCollectionAssignment({
                 tournamentParticipants: tournamentParticipants,
@@ -9773,13 +9779,13 @@ function getAllStructureMatchUps(_a) {
                 matchUpType: matchUpType,
             })
             : undefined;
-        var roundName = ((_d = roundNamingProfile === null || roundNamingProfile === void 0 ? void 0 : roundNamingProfile[roundNumber]) === null || _d === void 0 ? void 0 : _d.roundName) ||
+        var roundName = ((_h = roundNamingProfile === null || roundNamingProfile === void 0 ? void 0 : roundNamingProfile[roundNumber]) === null || _h === void 0 ? void 0 : _h.roundName) ||
             additionalContext.roundName;
-        var abbreviatedRoundName = ((_e = roundNamingProfile === null || roundNamingProfile === void 0 ? void 0 : roundNamingProfile[roundNumber]) === null || _e === void 0 ? void 0 : _e.abbreviatedRoundName) ||
+        var abbreviatedRoundName = ((_j = roundNamingProfile === null || roundNamingProfile === void 0 ? void 0 : roundNamingProfile[roundNumber]) === null || _j === void 0 ? void 0 : _j.abbreviatedRoundName) ||
             additionalContext.abbreviatedRoundName;
-        var feedRound = (_f = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _f === void 0 ? void 0 : _f.feedRound;
-        var preFeedRound = (_g = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _g === void 0 ? void 0 : _g.preFeedRound;
-        var roundFactor = (_h = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _h === void 0 ? void 0 : _h.roundFactor;
+        var feedRound = (_k = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _k === void 0 ? void 0 : _k.feedRound;
+        var preFeedRound = (_l = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _l === void 0 ? void 0 : _l.preFeedRound;
+        var roundFactor = (_m = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _m === void 0 ? void 0 : _m.roundFactor;
         var drawPositionsRoundRanges = drawPositionsRanges === null || drawPositionsRanges === void 0 ? void 0 : drawPositionsRanges[roundNumber];
         var drawPositionsRange = roundPosition
             ? drawPositionsRoundRanges === null || drawPositionsRoundRanges === void 0 ? void 0 : drawPositionsRoundRanges[roundPosition]
@@ -9788,18 +9794,17 @@ function getAllStructureMatchUps(_a) {
         // if part of a tie matchUp and collectionDefinition has a category definition, prioritize
         var matchUpCategory = (collectionDefinition === null || collectionDefinition === void 0 ? void 0 : collectionDefinition.category)
             ? __assign(__assign({}, ((context === null || context === void 0 ? void 0 : context.category) || {})), collectionDefinition.category) : context === null || context === void 0 ? void 0 : context.category;
-        var processCodes = (((_j = matchUp.processCodes) === null || _j === void 0 ? void 0 : _j.length) && matchUp.processCodes) ||
-            (((_k = collectionDefinition === null || collectionDefinition === void 0 ? void 0 : collectionDefinition.processCodes) === null || _k === void 0 ? void 0 : _k.length) &&
+        var processCodes = (((_o = matchUp.processCodes) === null || _o === void 0 ? void 0 : _o.length) && matchUp.processCodes) ||
+            (((_p = collectionDefinition === null || collectionDefinition === void 0 ? void 0 : collectionDefinition.processCodes) === null || _p === void 0 ? void 0 : _p.length) &&
                 (collectionDefinition === null || collectionDefinition === void 0 ? void 0 : collectionDefinition.processCodes)) ||
-            (((_l = structure === null || structure === void 0 ? void 0 : structure.processCodes) === null || _l === void 0 ? void 0 : _l.length) && (structure === null || structure === void 0 ? void 0 : structure.processCodes)) ||
-            (((_m = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.processCodes) === null || _m === void 0 ? void 0 : _m.length) && (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.processCodes)) ||
-            (((_o = event === null || event === void 0 ? void 0 : event.processCodes) === null || _o === void 0 ? void 0 : _o.length) && (event === null || event === void 0 ? void 0 : event.processCodes)) ||
+            (((_q = structure === null || structure === void 0 ? void 0 : structure.processCodes) === null || _q === void 0 ? void 0 : _q.length) && (structure === null || structure === void 0 ? void 0 : structure.processCodes)) ||
+            (((_r = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.processCodes) === null || _r === void 0 ? void 0 : _r.length) && (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.processCodes)) ||
+            (((_s = event === null || event === void 0 ? void 0 : event.processCodes) === null || _s === void 0 ? void 0 : _s.length) && (event === null || event === void 0 ? void 0 : event.processCodes)) ||
             (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.processCodes);
         var competitiveProfile = (contextProfile === null || contextProfile === void 0 ? void 0 : contextProfile.withCompetitiveness) &&
             getMatchUpCompetitiveProfile(__assign(__assign({}, contextContent), { matchUp: matchUp }));
         // necessry for SINGLES/DOUBLES matchUps that are part of TEAM tournaments
-        var finishingPositionRange = matchUp.finishingPositionRange ||
-            additionalContext.finishingPositionRange;
+        var finishingPositionRange = (_t = matchUp.finishingPositionRange) !== null && _t !== void 0 ? _t : additionalContext.finishingPositionRange;
         // order is important here as Round Robin matchUps already have inContext structureId
         var onlyDefined = function (obj) { return definedAttributes(obj, undefined, true); };
         var matchUpWithContext = __assign(__assign(__assign({}, onlyDefined(context)), onlyDefined({
@@ -9808,7 +9813,7 @@ function getAllStructureMatchUps(_a) {
             roundOfPlay: stage !== QUALIFYING &&
                 isConvertableInteger(initialRoundOfPlay) &&
                 initialRoundOfPlay + (roundNumber || 0),
-            endDate: matchUp.endDate || endDate,
+            endDate: (_u = matchUp.endDate) !== null && _u !== void 0 ? _u : endDate,
             gender: collectionDefinition === null || collectionDefinition === void 0 ? void 0 : collectionDefinition.gender,
             discipline: event === null || event === void 0 ? void 0 : event.discipline,
             category: matchUpCategory,
@@ -9837,9 +9842,9 @@ function getAllStructureMatchUps(_a) {
             drawId: drawId,
             stage: stage,
         })), makeDeepCopy(onlyDefined(matchUp), true, true));
-        if (matchUpFormat && ((_p = matchUp.score) === null || _p === void 0 ? void 0 : _p.scoreStringSide1)) {
+        if (matchUpFormat && ((_v = matchUp.score) === null || _v === void 0 ? void 0 : _v.scoreStringSide1)) {
             var parsedFormat = parse(matchUpFormat);
-            var _u = parsedFormat !== null && parsedFormat !== void 0 ? parsedFormat : {}, bestOf_1 = _u.bestOf, finalSetFormat_1 = _u.finalSetFormat, setFormat_1 = _u.setFormat;
+            var _0 = parsedFormat !== null && parsedFormat !== void 0 ? parsedFormat : {}, bestOf_1 = _0.bestOf, finalSetFormat_1 = _0.finalSetFormat, setFormat_1 = _0.setFormat;
             if ((finalSetFormat_1 === null || finalSetFormat_1 === void 0 ? void 0 : finalSetFormat_1.tiebreakSet) ||
                 (setFormat_1 === null || setFormat_1 === void 0 ? void 0 : setFormat_1.tiebreakSet) ||
                 (setFormat_1 === null || setFormat_1 === void 0 ? void 0 : setFormat_1.timed)) {
@@ -9859,12 +9864,12 @@ function getAllStructureMatchUps(_a) {
             }
         }
         if (Array.isArray(drawPositions)) {
-            var _v = getOrderedDrawPositions({
+            var _1 = getOrderedDrawPositions({
                 drawPositions: drawPositions,
                 roundProfile: roundProfile,
                 roundNumber: roundNumber,
-            }), orderedDrawPositions = _v.orderedDrawPositions, displayOrder = _v.displayOrder;
-            var isFeedRound_1 = (_q = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _q === void 0 ? void 0 : _q.feedRound;
+            }), orderedDrawPositions = _1.orderedDrawPositions, displayOrder = _1.displayOrder;
+            var isFeedRound_1 = (_w = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundNumber]) === null || _w === void 0 ? void 0 : _w.feedRound;
             var reversedDisplayOrder_1 = displayOrder[0] !== orderedDrawPositions[0];
             // ensure there are two sides generated
             var sideDrawPositions = orderedDrawPositions
@@ -9957,7 +9962,7 @@ function getAllStructureMatchUps(_a) {
             }
             var inferGender = (contextProfile === null || contextProfile === void 0 ? void 0 : contextProfile.inferGender) &&
                 (!matchUpWithContext.gender || matchUpWithContext.gender === MIXED) &&
-                ((_r = matchUpWithContext.sides) === null || _r === void 0 ? void 0 : _r.length) === 2 &&
+                ((_x = matchUpWithContext.sides) === null || _x === void 0 ? void 0 : _x.length) === 2 &&
                 matchUpWithContext.matchUpType !== TEAM$1;
             if (inferGender) {
                 var sideGenders = matchUpWithContext.sides.map(function (side) {
@@ -9979,7 +9984,7 @@ function getAllStructureMatchUps(_a) {
         }
         if (matchUpWithContext.tieMatchUps) {
             var isCollectionBye_1 = matchUpWithContext.matchUpStatus === BYE;
-            var lineUps_1 = (_s = matchUpWithContext.sides) === null || _s === void 0 ? void 0 : _s.map(function (_a) {
+            var lineUps_1 = (_y = matchUpWithContext.sides) === null || _y === void 0 ? void 0 : _y.map(function (_a) {
                 var participant = _a.participant, drawPosition = _a.drawPosition, sideNumber = _a.sideNumber, lineUp = _a.lineUp;
                 var teamParticipant = (participant === null || participant === void 0 ? void 0 : participant.participantType) === TEAM$1 && participant;
                 var teamParticipantValues = teamParticipant &&
@@ -10032,7 +10037,7 @@ function getAllStructureMatchUps(_a) {
         var readyToScore = scoringActive && hasParticipants && hasNoWinner;
         Object.assign(matchUpWithContext, { readyToScore: readyToScore, hasContext: true });
         if (hasParticipants) {
-            var _w = getCheckedInParticipantIds({ matchUp: matchUpWithContext }), allParticipantsCheckedIn = _w.allParticipantsCheckedIn, checkedInParticipantIds = _w.checkedInParticipantIds;
+            var _2 = getCheckedInParticipantIds({ matchUp: matchUpWithContext }), allParticipantsCheckedIn = _2.allParticipantsCheckedIn, checkedInParticipantIds = _2.checkedInParticipantIds;
             Object.assign(matchUpWithContext, {
                 allParticipantsCheckedIn: allParticipantsCheckedIn,
                 checkedInParticipantIds: checkedInParticipantIds,
@@ -11055,17 +11060,18 @@ function addUpcomingMatchUps(_a) {
     var drawDefinition = _a.drawDefinition, inContextDrawMatchUps = _a.inContextDrawMatchUps;
     var scheduleConflictMatchUpIds = {};
     inContextDrawMatchUps.forEach(function (inContextMatchUp) {
-        var _a, _b, _c, _d, _e;
-        var matchUpId = inContextMatchUp.matchUpId, structureId = inContextMatchUp.structureId, _f = inContextMatchUp.drawPositions, drawPositions = _f === void 0 ? [] : _f;
+        var _a, _b, _c, _d, _e, _f;
+        var matchUpId = inContextMatchUp.matchUpId, structureId = inContextMatchUp.structureId, _g = inContextMatchUp.drawPositions, drawPositions = _g === void 0 ? [] : _g;
         var structure = findStructure({ drawDefinition: drawDefinition, structureId: structureId }).structure;
         if ((structure === null || structure === void 0 ? void 0 : structure.finishingPosition) === WIN_RATIO) {
             var roundNumber = inContextMatchUp.roundNumber;
             var nextRoundNumber_1 = roundNumber && ensureInt(roundNumber) + 1;
-            var matchUps = structure.matchUps || [];
+            var matchUps = (_a = structure.matchUps) !== null && _a !== void 0 ? _a : [];
             var roundMatchUps_1 = getRoundMatchUps$1({ matchUps: matchUps }).roundMatchUps;
             // if this is a round robin then we have sidesTo information, not winnerTo and loserTo
             if (nextRoundNumber_1 && (roundMatchUps_1 === null || roundMatchUps_1 === void 0 ? void 0 : roundMatchUps_1[nextRoundNumber_1])) {
-                var sidesTo = drawPositions.sort().map(function (drawPosition, index) {
+                var sidesTo = __spreadArray([], __read(drawPositions), false).sort(numericSort)
+                    .map(function (drawPosition, index) {
                     var nextRoundMatchUp = roundMatchUps_1[nextRoundNumber_1].find(function (matchUp) { var _a; return (_a = matchUp.drawPositions) === null || _a === void 0 ? void 0 : _a.includes(drawPosition); });
                     return {
                         matchUpId: nextRoundMatchUp === null || nextRoundMatchUp === void 0 ? void 0 : nextRoundMatchUp.matchUpId,
@@ -11108,9 +11114,9 @@ function addUpcomingMatchUps(_a) {
                         loserTo;
             }
             // scheduleConflict in the following only applies to conflicts between subsequent matchUps WITHIN the same draw
-            var timeAfterRecovery = (_a = inContextMatchUp.schedule) === null || _a === void 0 ? void 0 : _a.timeAfterRecovery;
+            var timeAfterRecovery = (_b = inContextMatchUp.schedule) === null || _b === void 0 ? void 0 : _b.timeAfterRecovery;
             if (timeAfterRecovery) {
-                if ((_b = winnerTo === null || winnerTo === void 0 ? void 0 : winnerTo.schedule) === null || _b === void 0 ? void 0 : _b.scheduledTime) {
+                if ((_c = winnerTo === null || winnerTo === void 0 ? void 0 : winnerTo.schedule) === null || _c === void 0 ? void 0 : _c.scheduledTime) {
                     var scheduleConflict = timeStringMinutes(winnerTo.schedule.scheduledTime) <
                         timeStringMinutes(timeAfterRecovery);
                     if (scheduleConflict) {
@@ -11119,7 +11125,7 @@ function addUpcomingMatchUps(_a) {
                         winnerTo.schedule.scheduleConflict = inContextMatchUp.matchUpId;
                     }
                 }
-                if ((_c = loserTo === null || loserTo === void 0 ? void 0 : loserTo.schedule) === null || _c === void 0 ? void 0 : _c.scheduledTime) {
+                if ((_d = loserTo === null || loserTo === void 0 ? void 0 : loserTo.schedule) === null || _d === void 0 ? void 0 : _d.scheduledTime) {
                     var scheduleConflict = timeStringMinutes(loserTo.schedule.scheduledTime) <
                         timeStringMinutes(timeAfterRecovery);
                     if (scheduleConflict) {
@@ -11130,8 +11136,8 @@ function addUpcomingMatchUps(_a) {
                 }
             }
             Object.assign(inContextMatchUp, { winnerTo: winnerTo, loserTo: loserTo });
-            if ((_d = inContextMatchUp.drawPositions) === null || _d === void 0 ? void 0 : _d.filter(Boolean).length) {
-                var loserTargetLink = (_e = targetData.targetLinks) === null || _e === void 0 ? void 0 : _e.loserTargetLink;
+            if ((_e = inContextMatchUp.drawPositions) === null || _e === void 0 ? void 0 : _e.filter(Boolean).length) {
+                var loserTargetLink = (_f = targetData.targetLinks) === null || _f === void 0 ? void 0 : _f.loserTargetLink;
                 var firstMatchUp = (loserTargetLink === null || loserTargetLink === void 0 ? void 0 : loserTargetLink.linkCondition) === FIRST_MATCHUP;
                 var participants = getMatchUpParticipants(inContextMatchUp);
                 if (participants.length) {
@@ -12776,7 +12782,7 @@ function getScoreAnalysis(_a) {
     var setFormat = (isDecidingSet && (matchUpScoringFormat === null || matchUpScoringFormat === void 0 ? void 0 : matchUpScoringFormat.finalSetFormat)) ||
         (matchUpScoringFormat === null || matchUpScoringFormat === void 0 ? void 0 : matchUpScoringFormat.setFormat) ||
         {};
-    var isTimedSet = (setFormat === null || setFormat === void 0 ? void 0 : setFormat.timed) || (matchUpScoringFormat === null || matchUpScoringFormat === void 0 ? void 0 : matchUpScoringFormat.timed);
+    var isTimedSet = setFormat === null || setFormat === void 0 ? void 0 : setFormat.timed;
     var finalSet = isDecidingSet && sets[(matchUpScoringFormat === null || matchUpScoringFormat === void 0 ? void 0 : matchUpScoringFormat.bestOf) - 1];
     var finalSetIsComplete = finalSet === null || finalSet === void 0 ? void 0 : finalSet.winningSide;
     var isSetTiebreakEntry = testTiebreakEntry({
@@ -19458,7 +19464,7 @@ function getRoundRobinGroupMatchUps(_a) {
     return { groupMatchUps: groupMatchUps, uniqueMatchUpGroupings: uniqueMatchUpGroupings };
 }
 function drawPositionsHash(drawPositions) {
-    return drawPositions.sort(numericSort).join('|');
+    return __spreadArray([], __read(drawPositions), false).sort(numericSort).join('|');
 }
 function groupRounds(_a) {
     var groupSize = _a.groupSize, drawPositionOffset = _a.drawPositionOffset;
@@ -19483,8 +19489,7 @@ function groupRounds(_a) {
     aRow = __spreadArray([aHead, bUp], __read(aRow), false).filter(Boolean);
     bRow = __spreadArray(__spreadArray([], __read(bRow), false), [aDown], false).filter(Boolean);
     var sum = function (x) { return x[0].reduce(function (a, b) { return a + b; }); };
-    return rounds
-        .reverse()
+    return __spreadArray([], __read(rounds), false).reverse()
         .sort(function (a, b) { return sum(a) - sum(b); })
         .map(function (round) {
         return round
@@ -21905,31 +21910,23 @@ function getMatchUpContextIds(_a) {
 }
 
 function addMatchUpScheduledTime$2(params) {
+    var stack = 'addMatchUpScheduledTime';
     var matchUp = params.matchUp;
     var removePriorValues = params.removePriorValues, tournamentRecord = params.tournamentRecord, drawDefinition = params.drawDefinition, disableNotice = params.disableNotice, scheduledTime = params.scheduledTime, matchUpId = params.matchUpId;
     if (!matchUpId)
-        return { error: MISSING_MATCHUP_ID };
+        return decorateResult({ result: { error: MISSING_MATCHUP_ID }, stack: stack });
     // must support undefined as a value so that scheduledTime can be cleared
     if (!validTimeValue(scheduledTime))
-        return { error: INVALID_TIME };
+        return decorateResult({ result: { error: INVALID_TIME }, stack: stack });
     if (!matchUp) {
         var result = findMatchUp$1({ drawDefinition: drawDefinition, matchUpId: matchUpId });
         if (result.error)
-            return result;
+            return decorateResult({ result: result, stack: stack });
         matchUp = result.matchUp;
     }
     var timeDate = extractDate(scheduledTime);
-    var stack = 'addMatchUpScheduledTime';
-    if (timeDate) {
-        var scheduledDate = scheduledMatchUpDate({ matchUp: matchUp }).scheduledDate;
-        if (scheduledDate && scheduledDate !== timeDate) {
-            return decorateResult({
-                info: "date in time: ".concat(timeDate, " does not corresponde to scheduledDate: ").concat(scheduledDate),
-                result: { error: INVALID_TIME },
-                stack: stack,
-            });
-        }
-    }
+    var scheduledDate = scheduledMatchUpDate({ matchUp: matchUp }).scheduledDate;
+    var keepDate = timeDate && !scheduledDate;
     var existingTimeModifiers = matchUpTimeModifiers({ matchUp: matchUp }).timeModifiers || [];
     if (existingTimeModifiers === null || existingTimeModifiers === void 0 ? void 0 : existingTimeModifiers.length) {
         var result = addMatchUpTimeModifiers({
@@ -21942,10 +21939,10 @@ function addMatchUpScheduledTime$2(params) {
             matchUp: matchUp,
         });
         if (result === null || result === void 0 ? void 0 : result.error)
-            return result;
+            return decorateResult({ result: result, stack: stack });
     }
     // All times stored as military time
-    var militaryTime = convertTime(scheduledTime, true, true);
+    var militaryTime = convertTime(scheduledTime, true, keepDate);
     var itemValue = militaryTime;
     var timeItem = {
         itemType: SCHEDULED_TIME,
@@ -21963,14 +21960,19 @@ function addMatchUpScheduledTime$2(params) {
 }
 function addMatchUpTimeModifiers(_a) {
     var removePriorValues = _a.removePriorValues, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, disableNotice = _a.disableNotice, timeModifiers = _a.timeModifiers, matchUpId = _a.matchUpId, matchUp = _a.matchUp;
+    var stack = 'addMatchUpTimeModifiers';
     if (!matchUpId)
-        return { error: MISSING_MATCHUP_ID };
+        return decorateResult({ result: { error: MISSING_MATCHUP_ID }, stack: stack });
     if (timeModifiers !== undefined && !Array.isArray(timeModifiers))
-        return { error: INVALID_VALUES, info: mustBeAnArray('timeModifiers') };
+        return decorateResult({
+            info: mustBeAnArray('timeModifiers'),
+            result: { error: INVALID_VALUES },
+            stack: stack,
+        });
     if (!matchUp) {
         var result = findMatchUp$1({ drawDefinition: drawDefinition, matchUpId: matchUpId });
         if (result.error)
-            return result;
+            return decorateResult({ result: result, stack: stack });
         matchUp = result.matchUp;
     }
     var existingTimeModifiers = matchUpTimeModifiers({ matchUp: matchUp }).timeModifiers || [];
@@ -21993,7 +21995,7 @@ function addMatchUpTimeModifiers(_a) {
             matchUpId: matchUpId,
         });
         if (result.error)
-            return result;
+            return decorateResult({ result: result, stack: stack });
     }
     // undefined value when array is empty;
     var itemValue = !(timeModifiers === null || timeModifiers === void 0 ? void 0 : timeModifiers.length)
@@ -39044,10 +39046,11 @@ function bulkRescheduleMatchUps$1(_a) {
                         doNotReschedule = newTime < 0 || newTime > dayTotalMinutes;
                         if (!doNotReschedule) {
                             var timeString = addMinutesToTimeString(scheduledTime, minutesChange);
-                            newScheduledTime =
-                                scheduledTimeDate && newScheduledDate
-                                    ? "".concat(newScheduledDate, "T").concat(timeString)
-                                    : timeString;
+                            var timeStringDate = (scheduledTimeDate && newScheduledDate) ||
+                                (scheduledDate === scheduledTimeDate && scheduledTimeDate);
+                            newScheduledTime = timeStringDate
+                                ? "".concat(timeStringDate, "T").concat(timeString)
+                                : timeString;
                         }
                     }
                     if (doNotReschedule) {