hevy-shared 1.0.974 → 1.0.976

package/built/hevyTrainer.d.ts

@@ -59,7 +59,7 @@ export interface ProgramGenerationParams<T extends HevyTrainerLibraryExercise> {
     exerciseStore: T[];
     focusMuscle?: SimplifiedMuscleGroup;
     excludedExerciseIds?: Set<string>;
-    cardio: CardioPreference;
+    cardioPreference: CardioPreference;
     /**
      * When enabled, includes exercise selection trace breadcrumbs in the result
      * for debugging. Intended for troubleshooting on backoffice; keep off in
@@ -67,8 +67,10 @@ export interface ProgramGenerationParams<T extends HevyTrainerLibraryExercise> {
      */
     debugExerciseSelectionTrace?: boolean;
 }
-export interface ProgramExerciseSelectionTraceRecord {
+export interface TemplateExerciseSelectionTraceRecord {
+    traceKind: 'template';
     routine: HevyTrainerRoutineName;
+    /** Template slot index. */
     prescriptionIndex: number;
     prescription: ExercisePrescription;
     resolvedMuscleGroup: MuscleGroup;
@@ -76,6 +78,20 @@ export interface ProgramExerciseSelectionTraceRecord {
     selectedExerciseId?: string;
     trace: ExerciseSelectionTrace;
 }
+export interface CardioExerciseSelectionTraceRecord {
+    traceKind: 'cardio';
+    routine: HevyTrainerRoutineName;
+    /**
+     * Ordering key alongside template traces: `-1` when cardio is inserted before
+     * template exercises; `templatePrescriptionCount` when appended after.
+     */
+    prescriptionIndex: number;
+    selectedExerciseId?: string;
+    equipments: GranularEquipment[];
+    level: TrainingLevel;
+    trace: ExerciseSelectionTrace;
+}
+export type ProgramExerciseSelectionTraceRecord = TemplateExerciseSelectionTraceRecord | CardioExerciseSelectionTraceRecord;
 export type TrainerProgramAttemptWithTraces = TrainerProgramAttempt & {
     exerciseSelectionTraces: ProgramExerciseSelectionTraceRecord[];
 };
@@ -146,7 +162,9 @@ export interface TrainerAlgorithmSettings {
     exercise_notes: ExerciseNotes;
     exercise_replacements: ExerciseReplacements;
 }
-export interface TrainerProgramExercise {
+/** Resistance prescriptions from templates (sets, reps, rest, notes). */
+export interface TrainerProgramResistanceExercise {
+    kind: 'resistance';
     exerciseTemplate: HevyTrainerLibraryExercise;
     muscleGroup: MuscleGroup | 'focus_muscle';
     category: HevyTrainerExerciseCategory;
@@ -157,6 +175,15 @@ export interface TrainerProgramExercise {
     restTimerSeconds: number;
     notes?: string;
 }
+/** Optional cardio attachment — no prescription semantics beyond exercise choice. */
+export interface TrainerProgramCardioExercise {
+    kind: 'cardio';
+    exerciseTemplate: HevyTrainerLibraryExercise;
+    durationSeconds: number;
+}
+export type TrainerProgramExercise = TrainerProgramResistanceExercise | TrainerProgramCardioExercise;
+export declare function isTrainerProgramResistanceExercise(exercise: TrainerProgramExercise): exercise is TrainerProgramResistanceExercise;
+export declare function isTrainerProgramCardioExercise(exercise: TrainerProgramExercise): exercise is TrainerProgramCardioExercise;
 export interface TrainerProgramRoutine {
     name: HevyTrainerRoutineName;
     exercises: TrainerProgramExercise[];
@@ -209,6 +236,7 @@ export declare function pickExerciseForPrescription<T extends HevyTrainerLibrary
 }): PickExerciseResult<T>;
 export declare function pickExerciseForPrescription<T extends HevyTrainerLibraryExercise>(params: ExerciseSelectionParams<T>): T | undefined;
 export type HevyTrainerLibraryExercise = Pick<LibraryExercise, 'id' | 'title' | 'priority' | 'muscle_group' | 'other_muscles' | 'exercise_type' | 'equipment_category' | 'category' | 'level' | 'goal' | 'granular_equipments'>;
+export declare const DEFAULT_TRAINER_CARDIO_ATTACHMENT_DURATION_SECONDS = 600;
 export interface ExercisePrescriptionError {
     type: 'exercise_not_found';
     prescription: ExercisePrescription;

package/built/hevyTrainer.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrioritySortedExercises = exports.isEquipmentCompatible = exports.normalizeExerciseCategory = exports.getTrainerRestTimerSeconds = exports.getTrainerRepRange = exports.getTrainerSetCount = exports.programSplits = exports.frequencyMap = exports.routineNames = exports.defaultDurationPerFrequency = exports.hevyTrainerExerciseCategories = exports.granularEquipmentsToTrainerEquipments = exports.trainerEquipmentToGranularEquipments = exports.granularEquipmentDefaults = exports.trainerGymTypes = exports.workoutDurationOptions = void 0;
+exports.DEFAULT_TRAINER_CARDIO_ATTACHMENT_DURATION_SECONDS = exports.getPrioritySortedExercises = exports.isEquipmentCompatible = exports.normalizeExerciseCategory = exports.getTrainerRestTimerSeconds = exports.getTrainerRepRange = exports.getTrainerSetCount = exports.programSplits = exports.frequencyMap = exports.routineNames = exports.defaultDurationPerFrequency = exports.hevyTrainerExerciseCategories = exports.granularEquipmentsToTrainerEquipments = exports.trainerEquipmentToGranularEquipments = exports.granularEquipmentDefaults = exports.trainerGymTypes = exports.workoutDurationOptions = void 0;
+exports.isTrainerProgramResistanceExercise = isTrainerProgramResistanceExercise;
+exports.isTrainerProgramCardioExercise = isTrainerProgramCardioExercise;
 exports.pickExerciseForPrescription = pickExerciseForPrescription;
 exports.generateProgram = generateProgram;
 const _1 = require(".");
@@ -197,6 +199,12 @@ exports.programSplits = {
     5: ['push_1', 'pull_1', 'legs_1', 'upper_2', 'lower_2'],
     6: ['push_2_a', 'pull_2_a', 'legs_2_a', 'push_2_b', 'pull_2_b', 'legs_2_b'],
 };
+function isTrainerProgramResistanceExercise(exercise) {
+    return exercise.kind === 'resistance';
+}
+function isTrainerProgramCardioExercise(exercise) {
+    return exercise.kind === 'cardio';
+}
 const getTrainerSetCount = (trainerAlgorithmSettings, goal, frequency) => {
     return trainerAlgorithmSettings.sets[exports.frequencyMap[frequency]][goal];
 };
@@ -536,9 +544,67 @@ function pickExerciseForPrescription(params) {
     }
     return pickExerciseForPrescriptionWithTrace(params).exercise;
 }
+const CARDIO_TRACE_INDEX_BEFORE_TEMPLATE = -1;
+exports.DEFAULT_TRAINER_CARDIO_ATTACHMENT_DURATION_SECONDS = 600;
+function appendCardioExerciseSelectionTrace(traces, params) {
+    traces.push({
+        traceKind: 'cardio',
+        routine: params.routine,
+        prescriptionIndex: params.prescriptionIndex,
+        selectedExerciseId: params.selectedExerciseId,
+        equipments: params.equipments,
+        level: params.level,
+        trace: {
+            entries: [
+                {
+                    pass: 1,
+                    label: 'cardio: first priority exercise matching equipment + level; globally excluded IDs skipped',
+                    candidatePoolSize: params.candidatePoolSize,
+                    selectedExerciseId: params.selectedExerciseId,
+                },
+            ],
+            selectedPass: 1,
+        },
+    });
+}
+/** Inserts optional cardio before or after template exercises for one routine. */
+const attachOptionalCardioToRoutine = ({ cardioPreference, cardioExercises, criteria, debugExerciseSelectionTrace, exerciseSelectionTraces, routine, templatePrescriptionCount, routineExercises, }) => {
+    if (!cardioPreference)
+        return;
+    const cardioExercise = cardioExercises.find((ex) => {
+        var _a, _b, _c;
+        const equipmentCompatible = (0, exports.isEquipmentCompatible)(ex, criteria.equipments);
+        const levelCompatible = (_a = ex.level) === null || _a === void 0 ? void 0 : _a.includes(criteria.level);
+        const excluded = (_c = (_b = criteria.excludedExerciseIds) === null || _b === void 0 ? void 0 : _b.has(ex.id)) !== null && _c !== void 0 ? _c : false;
+        return equipmentCompatible && levelCompatible && !excluded;
+    });
+    if (!cardioExercise)
+        return;
+    const slot = {
+        kind: 'cardio',
+        exerciseTemplate: cardioExercise,
+        durationSeconds: exports.DEFAULT_TRAINER_CARDIO_ATTACHMENT_DURATION_SECONDS,
+    };
+    if (cardioPreference === 'beginning')
+        routineExercises.unshift(slot);
+    else
+        routineExercises.push(slot);
+    if (debugExerciseSelectionTrace) {
+        appendCardioExerciseSelectionTrace(exerciseSelectionTraces, {
+            routine,
+            prescriptionIndex: cardioPreference === 'beginning'
+                ? CARDIO_TRACE_INDEX_BEFORE_TEMPLATE
+                : templatePrescriptionCount,
+            selectedExerciseId: cardioExercise.id,
+            equipments: criteria.equipments,
+            level: criteria.level,
+            candidatePoolSize: cardioExercises.length,
+        });
+    }
+};
 function generateProgram(params) {
     var _a, _b;
-    const { trainerAlgorithmSettings, frequency, goal, level, equipments, workoutDurationMinutes, restTimerLength, exerciseStore, focusMuscle, excludedExerciseIds, debugExerciseSelectionTrace, cardio, } = params;
+    const { trainerAlgorithmSettings, frequency, goal, level, equipments, workoutDurationMinutes, restTimerLength, exerciseStore, focusMuscle, excludedExerciseIds, debugExerciseSelectionTrace, cardioPreference, } = params;
     const exerciseSelectionTraces = [];
     const routines = exports.programSplits[frequency];
     const program = {
@@ -598,6 +664,7 @@ function generateProgram(params) {
                 });
                 exercise = selection.exercise;
                 exerciseSelectionTraces.push({
+                    traceKind: 'template',
                     routine,
                     prescriptionIndex,
                     prescription: exercisePrescription,
@@ -627,6 +694,7 @@ function generateProgram(params) {
                     programFocusMuscleExerciseCount++;
                 const repRange = (0, exports.getTrainerRepRange)(trainerAlgorithmSettings, goal, exercisePrescription.category);
                 routineExercises.push({
+                    kind: 'resistance',
                     exerciseTemplate: exercise,
                     muscleGroup: exercisePrescription.muscle_group,
                     category: exercisePrescription.category,
@@ -653,90 +721,16 @@ function generateProgram(params) {
                 });
             }
         }
-        if (cardio) {
-            const cardioExercises = sortedExercises['cardio'];
-            const cardioExercise = findMatchingExercise(cardioExercises, {
-                frequency,
-                exerciseCategory: 'all',
-                equipments,
-                muscleGroup: 'cardio',
-                routineBarbellExerciseCount,
-                level,
-                goal: 'all',
-            }, {
-                programUsedExerciseIds,
-                routineUsedExerciseIds,
-                excludedExerciseIds,
-            });
-            // TODO change the interface to include cardio
-            if (cardioExercise) {
-                if (cardio === 'beginning') {
-                    routineExercises.unshift({
-                        exerciseTemplate: cardioExercise,
-                        muscleGroup: 'cardio',
-                        category: 'compound',
-                        sets: 1,
-                        repRangeStart: 0,
-                        repRangeEnd: 0,
-                        restTimerSeconds: 0,
-                    });
-                    exerciseSelectionTraces.unshift({
-                        routine,
-                        prescriptionIndex: 0,
-                        prescription: { muscle_group: 'cardio', category: 'compound' },
-                        resolvedMuscleGroup: 'cardio',
-                        criteria: {
-                            frequency,
-                            exerciseCategory: 'all',
-                            equipments,
-                            muscleGroup: 'cardio',
-                            routineBarbellExerciseCount,
-                            level,
-                            goal: 'all',
-                        },
-                        selectedExerciseId: cardioExercise.id,
-                        trace: {
-                            entries: [],
-                            selectedPass: 1,
-                        },
-                    });
-                }
-                else {
-                    routineExercises.push({
-                        exerciseTemplate: cardioExercise,
-                        muscleGroup: 'cardio',
-                        category: 'compound',
-                        sets: 1,
-                        repRangeStart: 0,
-                        repRangeEnd: 0,
-                        restTimerSeconds: 0,
-                    });
-                    // todo: handle debug traces with the exercises
-                    exerciseSelectionTraces.push({
-                        routine,
-                        prescriptionIndex: routineExercises.length,
-                        prescription: { muscle_group: 'cardio', category: 'compound' },
-                        resolvedMuscleGroup: 'cardio',
-                        criteria: {
-                            frequency,
-                            exerciseCategory: 'all',
-                            equipments,
-                            muscleGroup: 'cardio',
-                            routineBarbellExerciseCount,
-                            level,
-                            goal: 'all',
-                        },
-                        selectedExerciseId: cardioExercise.id,
-                        trace: {
-                            entries: [],
-                            selectedPass: 1,
-                        },
-                    });
-                }
-                programUsedExerciseIds.add(cardioExercise.id);
-                routineUsedExerciseIds.add(cardioExercise.id);
-            }
-        }
+        attachOptionalCardioToRoutine({
+            cardioPreference,
+            cardioExercises: sortedExercises.cardio,
+            criteria: { equipments, level, excludedExerciseIds },
+            debugExerciseSelectionTrace,
+            exerciseSelectionTraces,
+            routine,
+            templatePrescriptionCount: routineTemplate.exercises.length,
+            routineExercises,
+        });
         program.routines.push({
             name: routine,
             notes: routineTemplate.notes,

package/built/index.d.ts

@@ -1293,9 +1293,9 @@ export interface UpdateHevyTrainerProgramRequestBody {
         weekly_frequency: WeeklyTrainingFrequency;
         focus_muscle?: SimplifiedMuscleGroup;
         next_workout_index?: number;
+        cardio_preference?: CardioPreference;
         workout_duration_minutes?: WorkoutDurationMinutes;
         rest_timer_length?: RestTimerLength;
-        cardio_preference?: CardioPreference;
         routines: {
             id: string;
             title: string;

package/built/tests/hevyTrainer.test.d.ts

@@ -0,0 +1 @@
+export {};