tods-competition-factory 2.2.11 → 2.2.13

package/dist/tods-competition-factory.d.ts

@@ -183,18 +183,8 @@ interface TimeItem {
     itemType?: string;
     itemValue?: any;
 }
-declare enum CategoryEnum {
-    AGE = "AGE",
-    BOTH = "BOTH",
-    LEVEL = "LEVEL"
-}
-type CategoryUnion = keyof typeof CategoryEnum;
-declare enum DisciplineEnum {
-    BEACH_TENNIS = "BEACH_TENNIS",
-    TENNIS = "TENNIS",
-    WHEELCHAIR_TENNIS = "WHEELCHAIR_TENNIS"
-}
-type DisciplineUnion = keyof typeof DisciplineEnum;
+type DisciplineUnion = 'BEACH_TENNIS' | 'TENNIS' | 'WHEELCHAIR_TENNIS';
+type CategoryUnion = 'AGE' | 'BOTH' | 'LEVEL';
 interface DrawDefinition {
     activeDates?: Date[] | string[];
     automated?: boolean;
@@ -222,12 +212,7 @@ interface DrawDefinition {
     timeItems?: TimeItem[];
     updatedAt?: Date | string;
 }
-declare enum DrawStatusEnum {
-    COMPLETE = "COMPLETE",
-    IN_PROGRESS = "IN_PROGRESS",
-    TO_BE_PLAYED = "TO_BE_PLAYED"
-}
-type DrawStatusUnion = keyof typeof DrawStatusEnum;
+type DrawStatusUnion = 'COMPLETE' | 'IN_PROGRESS' | 'TO_BE_PLAYED';
 interface Entry {
     createdAt?: Date | string;
     entryId?: string;
@@ -372,12 +357,7 @@ interface MatchUpFinishingPositionRange {
     loser: number[];
     winner: number[];
 }
-declare enum IndoorOutdoorEnum {
-    INDOOR = "INDOOR",
-    MIXED = "MIXED",
-    OUTDOOR = "OUTDOOR"
-}
-type IndoorOutdoorUnion = keyof typeof IndoorOutdoorEnum;
+type IndoorOutdoorUnion = 'INDOOR' | 'MIXED' | 'OUTDOOR';
 declare enum MatchUpStatusEnum {
     ABANDONED = "ABANDONED",
     AWAITING_RESULT = "AWAITING_RESULT",

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.2.11';
+    return '2.2.13';
 }
 
 const SINGLES_MATCHUP = 'SINGLES';
@@ -2143,11 +2143,11 @@ function isValidMatchUpFormat({ matchUpFormat }) {
     if (!isString(matchUpFormat) || matchUpFormat === '')
         return false;
     const parsedFormat = parse(matchUpFormat);
-    const setParts = matchUpFormat.match(/-S:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/);
+    const setParts = matchUpFormat.match(/-S:([1-9])+\/TB(\d{1,2})@?([1-9]?)*/);
     const setsTo = setParts?.[1];
     const tiebreakTo = setParts?.[2];
     const tiebreakAt = setParts?.[3];
-    const finalSetParts = matchUpFormat.match(/-F:([1-9])+\/TB([0-9]{1,2})@?([1-9]?)*/);
+    const finalSetParts = matchUpFormat.match(/-F:([1-9])+\/TB(\d{1,2})@?([1-9]?)*/);
     const finalSetTo = finalSetParts?.[1];
     const finalSetTiebreakTo = finalSetParts?.[2];
     const finalTiebreakAt = finalSetParts?.[3];
@@ -2478,8 +2478,10 @@ function getCategoryAgeDetails(params) {
     let { ageCategoryCode, ageMaxDate, ageMinDate, ageMax, ageMin } = category;
     const categoryName = category.categoryName;
     let combinedAge;
-    if (!typeMatch([ageCategoryCode, ageMaxDate, ageMinDate, categoryName], 'string') ||
-        !allNumeric([ageMax, ageMin] || ![ageMaxDate, ageMinDate].filter(Boolean).every(isValidDateString)))
+    const isValidCategory = typeMatch([ageCategoryCode, ageMaxDate, ageMinDate, categoryName], 'string') &&
+        allNumeric([ageMax, ageMin]) &&
+        [ageMaxDate, ageMinDate].filter(Boolean).every(isValidDateString);
+    if (!isValidCategory)
         return { error: INVALID_CATEGORY };
     const consideredDate = params.consideredDate ?? extractDate(new Date().toLocaleDateString('sv'));
     if (!isValidDateString(consideredDate))
@@ -5703,7 +5705,7 @@ function addPositionActionTelemetry(params) {
         name: POSITION_ACTIONS,
         element: drawDefinition,
     });
-    const existingValue = Array.isArray(extension?.value) ? extension?.value ?? [] : [];
+    const existingValue = Array.isArray(extension?.value) ? (extension?.value ?? []) : [];
     if (!existingValue?.length) {
         const mainStructure = drawDefinition.structures.find((structure) => structure.stage === MAIN);
         if (mainStructure) {
@@ -7785,7 +7787,8 @@ function getParticipantMap({ withIndividualParticipants, convertExtensions, tour
     const participantMap = {};
     for (const participant of tournamentRecord.participants ?? []) {
         const participantId = participant?.participantId;
-        participantId && initializeParticipantId({ participantMap, participantId });
+        if (participantId)
+            initializeParticipantId({ participantMap, participantId });
     }
     for (const participant of tournamentRecord.participants ?? []) {
         const participantCopy = makeDeepCopy(participant, convertExtensions, internalUse);
@@ -8955,7 +8958,7 @@ function getRoundContextProfile({ roundNamingPolicy, drawDefinition, structure,
             .filter((structure) => structure.stage === QUALIFYING)
             .map(({ stageSequence }) => stageSequence ?? 1), 0)
         : 0;
-    const preQualifyingSequence = (structure.stageSequence ?? 1) < qualifyingStageSequences ? structure.stageSequence ?? 1 : '';
+    const preQualifyingSequence = (structure.stageSequence ?? 1) < qualifyingStageSequences ? (structure.stageSequence ?? 1) : '';
     const preQualifyingAffix = preQualifyingSequence
         ? roundNamingPolicy?.affixes?.preQualifying || defaultRoundNamingPolicy.affixes.preQualifying || ''
         : '';
@@ -10200,7 +10203,7 @@ function addMatchUpContext({ scheduleVisibilityFilters, sourceDrawPositionRanges
         collectionDefinitions?.find((definition) => definition.collectionId === matchUp.collectionId);
     const matchUpFormat = matchUp.collectionId
         ? collectionDefinition?.matchUpFormat
-        : matchUp.matchUpFormat ?? structure?.matchUpFormat ?? drawDefinition?.matchUpFormat ?? event?.matchUpFormat;
+        : (matchUp.matchUpFormat ?? structure?.matchUpFormat ?? drawDefinition?.matchUpFormat ?? event?.matchUpFormat);
     const matchUpType = matchUp.matchUpType ||
         collectionDefinition?.matchUpType ||
         structure?.matchUpType ||
@@ -10249,7 +10252,7 @@ function addMatchUpContext({ scheduleVisibilityFilters, sourceDrawPositionRanges
             ...(context?.category || {}),
             ...collectionDefinition.category,
         }
-        : context?.category ?? event?.category;
+        : (context?.category ?? event?.category);
     const processCodes = (matchUp.processCodes?.length && matchUp.processCodes) ||
         (collectionDefinition?.processCodes?.length && collectionDefinition?.processCodes) ||
         (structure?.processCodes?.length && structure?.processCodes) ||
@@ -11871,7 +11874,7 @@ function addFinishingRounds({ finishingPositionOffset = 0, finishingPositionLimi
             };
             const upcomingMatchUps = roundMatchUpsCountArray?.slice(roundNumber - 1).reduce((a, b) => a + (b || 0), 0);
             const fmlcException = fmlc && roundNumber !== 1;
-            const rangeOffset = 1 + finishingPositionOffset + (fmlcException ? positionsFed ?? 0 : 0);
+            const rangeOffset = 1 + finishingPositionOffset + (fmlcException ? (positionsFed ?? 0) : 0);
             const finalPosition = 1;
             const positionRange = generateRange(rangeOffset, lucky ? rangeOffset + matchUpsCount * 2 : upcomingMatchUps + rangeOffset + finalPosition);
             const slicer = upcomingMatchUps + finalPosition - matchUpsCount;
@@ -12153,7 +12156,7 @@ function getStructureDrawPositionProfiles(params) {
         const result = findStructure({ drawDefinition, structureId });
         if (result.error)
             return result;
-        structure = findContainer ? result.containingStructure ?? result.structure : result.structure;
+        structure = findContainer ? (result.containingStructure ?? result.structure) : result.structure;
     }
     if (isAdHoc({ structure })) {
         return { structure, isAdHoc: true, error: INVALID_DRAW_POSITION };
@@ -13524,7 +13527,7 @@ function getPubStatus({ event }) {
     const drawDetailPublishedIds = drawDetails &&
         Object.keys(drawDetails).length &&
         Object.keys(drawDetails).filter((drawId) => getDrawPublishStatus({ drawDetails, drawId }));
-    const publishedDrawIds = drawDetailPublishedIds?.length ? drawDetailPublishedIds : eventPubStatus.drawIds ?? [];
+    const publishedDrawIds = drawDetailPublishedIds?.length ? drawDetailPublishedIds : (eventPubStatus.drawIds ?? []);
     if (publishedDrawIds?.length && !drawDetailPublishedIds?.length) {
         for (const drawId of publishedDrawIds) {
             drawDetails[drawId] = {
@@ -13738,7 +13741,8 @@ function processSides(params) {
                 individualParticipantIds.forEach((participantId, i) => {
                     const partnerParticipantId = individualParticipantIds[1 - i];
                     const participant = participantMap[participantId];
-                    participant && addPartner({ participant, partnerParticipantId });
+                    if (participant)
+                        addPartner({ participant, partnerParticipantId });
                 });
                 if (withEvents && matchUpSides) {
                     const teamParticipantId = matchUpSides.find((s) => s.sideNumber === sideNumber)?.participant?.participantId;
@@ -16341,7 +16345,7 @@ function getNextSeedBlock(params) {
     const seedsWithoutDrawPositions = seedAssignments?.filter((assignment) => !assignment.participantId);
     const seedsLeftToAssign = unplacedSeedAssignments?.length && unplacedSeedAssignments.length > 0
         ? unplacedSeedAssignments.length
-        : seedsWithoutDrawPositions?.length ?? 0;
+        : (seedsWithoutDrawPositions?.length ?? 0);
     const unfilled = (seedsLeftToAssign &&
         nextSeedBlock?.drawPositions.filter((drawPosition) => !assignedDrawPositions?.includes(drawPosition))) ||
         [];
@@ -21948,7 +21952,7 @@ function getParticipantResults({ participantIds, pressureRating, matchUpFormat,
         ? tieMatchUps
             .filter(({ matchUpStatus }) => !excludeMatchUpStatuses.includes(matchUpStatus))
             .flatMap(({ score }) => score?.sets?.length ?? 0)
-        : score?.sets?.length ?? 0);
+        : (score?.sets?.length ?? 0));
     const totalSets = allSets?.reduce((a, b) => a + b, 0);
     for (const matchUp of filteredMatchUps ?? []) {
         const { matchUpStatus, tieMatchUps, tieFormat, score, winningSide, sides } = matchUp;
@@ -22286,7 +22290,7 @@ function getTallyReport({ matchUps, order, report }) {
                 const floatSort = (a, b) => parseFloat(step.reversed ? a : b) - parseFloat(step.reversed ? b : a);
                 const participantsCount = step.groups
                     ? Object.values(step.groups).flat(Infinity).length
-                    : step.participantIds?.length ?? 0;
+                    : (step.participantIds?.length ?? 0);
                 const getExplanation = (step) => {
                     step.groups &&
                         Object.keys(step.groups)
@@ -22897,11 +22901,11 @@ function modifyMatchUpScore(params) {
             const updateTally = (structure) => {
                 matchUpFormat = isDualMatchUp
                     ? 'SET1-S:T100'
-                    : matchUpFormat ??
+                    : (matchUpFormat ??
                         matchUp.matchUpFormat ??
                         structure?.matchUpFormat ??
                         drawDefinition?.matchUpFormat ??
-                        event?.matchUpFormat;
+                        event?.matchUpFormat);
                 const matchUpFilters = isDualMatchUp ? { matchUpTypes: [TEAM$2] } : undefined;
                 const { matchUps } = getAllStructureMatchUps({
                     afterRecoveryTimes: false,
@@ -25095,20 +25099,20 @@ function getEligibleVoluntaryConsolationParticipants({ excludedMatchUpStatuses =
     const eventMatchUpFilters = event?.eventType ? { matchUpTypes: [event.eventType] } : undefined;
     const drawMatchUpFilters = drawDefinition?.matchUpType ? { matchUpTypes: [drawDefinition.matchUpType] } : undefined;
     const matchUps = includeEventParticipants && event
-        ? allEventMatchUps({
+        ? (allEventMatchUps({
             contextFilters: { stages },
             matchUpFilters: eventMatchUpFilters,
             tournamentRecord,
             inContext: true,
             event,
-        })?.matchUps ?? []
-        : allDrawMatchUps({
+        })?.matchUps ?? [])
+        : (allDrawMatchUps({
             contextFilters: { stages },
             matchUpFilters: drawMatchUpFilters,
             tournamentRecord,
             inContext: true,
             drawDefinition,
-        })?.matchUps ?? [];
+        })?.matchUps ?? []);
     const voluntaryConsolationEntries = getStageEntries$2({
         stage: VOLUNTARY_CONSOLATION,
         drawDefinition,
@@ -30128,23 +30132,21 @@ function keyValueScore(params) {
     else if (analysis.isGameScoreEntry) {
         info = 'game scoreString entry';
     }
+    else if (analysis.lastSetIsComplete || !sets.length) {
+        updated = true;
+        const { scoreString: newScore, set } = keyValueSetScore({
+            analysis,
+            lowSide,
+            scoreString,
+            value: ensureInt(value),
+        });
+        if (set)
+            set.setNumber = sets?.length + 1 || 1;
+        sets = sets?.concat(set).filter(Boolean) || [set];
+        scoreString = newScore || undefined;
+    }
     else {
-        if (analysis.lastSetIsComplete || !sets.length) {
-            updated = true;
-            const { scoreString: newScore, set } = keyValueSetScore({
-                analysis,
-                lowSide,
-                scoreString,
-                value: ensureInt(value),
-            });
-            if (set)
-                set.setNumber = sets?.length + 1 || 1;
-            sets = sets?.concat(set).filter(Boolean) || [set];
-            scoreString = newScore || undefined;
-        }
-        else {
-            console.log('error: unknown outcome');
-        }
+        console.log('error: unknown outcome');
     }
     if (updated) {
         sets = sets?.filter(Boolean);
@@ -30223,10 +30225,8 @@ function correctContainerMismatch(score) {
                     lastType = '';
                 return complement;
             }
-            else {
-                if (!typeCount[lastType])
-                    lastType = '';
-            }
+            else if (!typeCount[lastType])
+                lastType = '';
         }
         return char;
     })
@@ -35493,31 +35493,32 @@ function tournamentRelevantSchedulingIds(params) {
         tournamentIds.push(tournamentId);
         tournamentMap[tournamentId] = {};
         const events = tournamentRecord?.events || [];
-        events.forEach((event) => {
+        for (const event of events) {
             const eventId = event.eventId;
             eventIds.push(eventId);
             tournamentMap[tournamentId][eventId] = {};
-            (event.drawDefinitions || []).forEach((drawDefinition) => {
+            const mapParsedInt = (roundNumber) => parseInt(roundNumber);
+            for (const drawDefinition of event.drawDefinitions || []) {
                 const drawId = drawDefinition.drawId;
                 drawIds.push(drawId);
                 tournamentMap[tournamentId][eventId][drawId] = {};
                 const { structures } = getDrawStructures({ drawDefinition });
-                (structures || []).forEach((structure) => {
+                for (const structure of structures || []) {
                     const structureId = structure.structureId;
                     const { matchUps } = getAllStructureMatchUps({ structure });
                     const { roundMatchUps } = getRoundMatchUps({ matchUps });
-                    const rounds = roundMatchUps && Object.keys(roundMatchUps).map((roundNumber) => parseInt(roundNumber));
+                    const rounds = roundMatchUps && Object.keys(roundMatchUps).map(mapParsedInt);
                     tournamentMap[tournamentId][eventId][drawId][structureId] = rounds;
                     structureIds.push(structureId);
                     if (structure.structures?.length) {
-                        structure.structures.forEach((itemStructure) => {
+                        for (const itemStructure of structure.structures) {
                             structureIds.push(itemStructure.structureId);
                             tournamentMap[tournamentId][eventId][drawId][itemStructure.structureId] = rounds;
-                        });
+                        }
                     }
-                });
-            });
-        });
+                }
+            }
+        }
     }
     return {
         tournamentMap,
@@ -36849,7 +36850,7 @@ function getPredictiveAccuracy(params) {
         : 0;
     const zoneMargin = isConvertableInteger(zonePct) && ratingsRangeDifference
         ? (zonePct ?? 0 / 100) * ratingsRangeDifference
-        : params.zoneMargin ?? ratingsRangeDifference;
+        : (params.zoneMargin ?? ratingsRangeDifference);
     const contextProfile = { withScaleValues: true, withCompetitiveness: true };
     const contextFilters = {
         matchUpTypes: matchUpType ? [matchUpType] : [SINGLES$1, DOUBLES$1],
@@ -38574,7 +38575,7 @@ function addParticipant(params) {
     const { allowDuplicateParticipantIdPairs, returnParticipant, disableNotice, pairOverride, participant } = params;
     const tournamentRecord = params.tournamentId
         ? params.tournamentRecords?.[params.tournamentId]
-        : params.tournamentRecord ?? (params.activeTournamentId && params.tournamentRecords?.[params.activeTournamentId]);
+        : (params.tournamentRecord ?? (params.activeTournamentId && params.tournamentRecords?.[params.activeTournamentId]));
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!participant)
@@ -39187,7 +39188,7 @@ function generateEventsFromTieFormat(params) {
             const entryStatus = eventType === DOUBLES_EVENT ? UNGROUPED : params.entryStatus || DIRECT_ACCEPTANCE;
             const participantIds = eventGender === MIXED
                 ? [...genderedParticipants[MALE], ...genderedParticipants[FEMALE]]
-                : genderedParticipants[eventGender] ?? [];
+                : (genderedParticipants[eventGender] ?? []);
             if (participantIds.length) {
                 const result = addEventEntries({
                     participantIds,
@@ -40579,7 +40580,7 @@ function checkCategoryUpdates(params) {
         const startDate = params.eventUpdates.startDate || params.event.startDate || params.tournamentRecord.startDate;
         const endDate = params.eventUpdates.endDate || params.event.endDate || params.tournamentRecord.endDate;
         const individualParticpants = params.enteredParticipants
-            .map((p) => (p.participantType === INDIVIDUAL ? p : p.individualParticpants ?? []))
+            .map((p) => (p.participantType === INDIVIDUAL ? p : (p.individualParticpants ?? [])))
             .flat();
         const startAgeDetails = getCategoryAgeDetails({ category, consideredDate: startDate });
         const endAgeDetails = getCategoryAgeDetails({ category, consideredDate: endDate });
@@ -40634,11 +40635,11 @@ function getEnteredParticipants(params) {
     })
         .map(({ participantId }) => participantId) ?? [];
     return enteredParticipantIds
-        ? getParticipants({
+        ? (getParticipants({
             participantFilters: { participantIds: enteredParticipantIds },
             withIndividualParticipants: true,
             tournamentRecord,
-        }).participants ?? []
+        }).participants ?? [])
         : [];
 }
 function getParticipantsProfile({ enteredParticipants }) {
@@ -41168,14 +41169,14 @@ function generateLineUps(params) {
         const singlesSort = teamParticipant.individualParticipants?.sort(singlesScaleSort) ?? [];
         const doublesSort = singlesOnly
             ? singlesSort
-            : teamParticipant.individualParticipants?.sort(doublesScaleSort) ?? [];
+            : (teamParticipant.individualParticipants?.sort(doublesScaleSort) ?? []);
         const participantAssignments = {};
         for (const collectionDefinition of collectionDefinitions) {
             const collectionParticipantIds = [];
             const { collectionId, matchUpCount, matchUpType, gender } = collectionDefinition;
             const singlesMatchUp = isMatchUpEventType(SINGLES_MATCHUP)(matchUpType);
             generateRange(0, matchUpCount).forEach((i) => {
-                const typeSort = singlesMatchUp ? singlesSort : doublesSort ?? [];
+                const typeSort = singlesMatchUp ? singlesSort : (doublesSort ?? []);
                 const collectionPosition = i + 1;
                 const participantIds = [];
                 generateRange(0, singlesMatchUp ? 1 : 2).forEach((i) => {
@@ -49974,7 +49975,7 @@ function generateEventParticipants(params) {
     const qualifyingParticipantsCount = uniqueParticipantsCount[QUALIFYING] || 0;
     const participantsCount = eventProfile.drawProfiles?.length
         ? mainParticipantsCount + qualifyingParticipantsCount
-        : eventProfile.participantsProfile?.participantsCount ?? 0;
+        : (eventProfile.participantsProfile?.participantsCount ?? 0);
     const sex = [MALE, FEMALE].includes(gender) ? gender : undefined;
     const idPrefix = participantsProfile?.idPrefix ? `E-${eventIndex}-${participantsProfile?.idPrefix}` : undefined;
     const { participants: uniqueFlightParticipants } = generateParticipants({
@@ -51095,8 +51096,8 @@ function processLeagueProfiles(params) {
             tournamentRecord.events = [];
         tournamentRecord.events.push(event);
         if (entries.length) {
-            const roundsCount = (isNumeric(leagueProfile.roundsCount) && leagueProfile.roundsCount) ??
-                leagueProfile.roundsCount === DOUBLE_ROUND_ROBIN
+            const roundsCount = ((isNumeric(leagueProfile.roundsCount) && leagueProfile.roundsCount) ??
+                leagueProfile.roundsCount === DOUBLE_ROUND_ROBIN)
                 ? (drawSize - 1) * 2
                 : drawSize - 1;
             const result = generateDrawDefinition({
@@ -56763,7 +56764,7 @@ function copyTournamentRecord(params) {
         }, false, true);
     };
     const tournamentRecord = {
-        participants: params.copyParticipants ? params.tournamentRecord.participants?.map(copyParticipant) ?? [] : [],
+        participants: params.copyParticipants ? (params.tournamentRecord.participants?.map(copyParticipant) ?? []) : [],
         parentOrganisation: makeDeepCopy({ ...params.tournamentRecord.parentOrganisation }, false, true),
         venues: makeDeepCopy(params.tournamentRecord.venues ?? [], false, true),
         extensions: filteredExtensions(params.tournamentRecord.extensions),
@@ -58180,7 +58181,7 @@ function JSON2CSV(arrayOfJSON, config) {
         .sort(sortColumns);
     Object.keys(columnMap).forEach((columnName) => !tranformedHeaderRow.includes(columnName) && tranformedHeaderRow.unshift(columnName));
     Object.keys(columnTransform).forEach((columnName) => !tranformedHeaderRow.includes(columnName) && tranformedHeaderRow.unshift(columnName));
-    typeof context === 'object' &&
+    if (typeof context === 'object')
         Object.keys(context).forEach((columnName) => !tranformedHeaderRow.includes(columnName) && tranformedHeaderRow.unshift(columnName));
     let mappedHeaderRow = tranformedHeaderRow.map((key) => columnMap[key] || key);
     if (onlyHeaderRow)