hevy-shared 1.0.984 → 1.0.986

package/built/hevyTrainer.d.ts

@@ -226,10 +226,10 @@ type PickExerciseResult<T extends HevyTrainerLibraryExercise> = {
     exercise?: T;
     trace: ExerciseSelectionTrace;
 };
-export declare function pickExerciseForPrescription<T extends HevyTrainerLibraryExercise>(params: ExerciseSelectionParams<T> & {
+export declare function pickTrainerExercise<T extends HevyTrainerLibraryExercise>(params: ExerciseSelectionParams<T> & {
     withTrace: true;
 }): PickExerciseResult<T>;
-export declare function pickExerciseForPrescription<T extends HevyTrainerLibraryExercise>(params: ExerciseSelectionParams<T>): T | undefined;
+export declare function pickTrainerExercise<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 {

package/built/hevyTrainer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_TRAINER_CARDIO_ATTACHMENT_DURATION_SECONDS = exports.getPrioritySortedExercises = exports.isEquipmentCompatible = exports.normalizeExerciseCategory = exports.getTrainerRestTimerSeconds = exports.getTrainerRepRange = exports.getTrainerSetCount = exports.isTrainerProgramCardioExercise = exports.isTrainerProgramResistanceExercise = exports.programSplits = exports.frequencyMap = exports.routineNames = exports.defaultDurationPerFrequency = exports.hevyTrainerExerciseCategories = exports.granularEquipmentsToTrainerEquipments = exports.trainerEquipmentToGranularEquipments = exports.granularEquipmentDefaults = exports.trainerGymTypes = exports.workoutDurationOptions = void 0;
-exports.pickExerciseForPrescription = pickExerciseForPrescription;
+exports.pickTrainerExercise = pickTrainerExercise;
 exports.generateProgram = generateProgram;
 const _1 = require(".");
 exports.workoutDurationOptions = [40, 60, 80];
@@ -455,7 +455,7 @@ const findAlternativeIsolationExercise = (exercises, criteria, context) => {
         return matchesCriteria && isNotUsed;
     });
 };
-const pickExerciseForPrescriptionWithTrace = (params) => {
+const pickTrainerExerciseWithTrace = (params) => {
     const { sortedExercises, handPickedExercises, criteria, context } = params;
     const trace = { entries: [] };
     const exercises = handPickedExercises
@@ -534,46 +534,35 @@ const pickExerciseForPrescriptionWithTrace = (params) => {
         ? { exercise, trace: Object.assign(Object.assign({}, trace), { selectedPass: 6 }) }
         : { exercise: undefined, trace };
 };
-function pickExerciseForPrescription(params) {
+function pickTrainerExercise(params) {
     if (params.withTrace) {
-        return pickExerciseForPrescriptionWithTrace(params);
+        return pickTrainerExerciseWithTrace(params);
     }
-    return pickExerciseForPrescriptionWithTrace(params).exercise;
+    return pickTrainerExerciseWithTrace(params).exercise;
 }
 const CARDIO_TRACE_INDEX_BEFORE_TEMPLATE = -1;
 exports.DEFAULT_TRAINER_CARDIO_ATTACHMENT_DURATION_SECONDS = 600;
-const 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, }) => {
+const attachOptionalCardioToRoutine = ({ cardioPreference, sortedExercises, criteria, debugExerciseSelectionTrace, exerciseSelectionTraces, routine, templatePrescriptionCount, routineExercises, }) => {
     if (cardioPreference === 'no-cardio')
         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;
-    });
+    // Cardio is reusable across routines, so program/routine used-id contexts are
+    // intentionally omitted — only the global excluded set applies.
+    const selectionParams = {
+        sortedExercises,
+        criteria: {
+            frequency: criteria.frequency,
+            goal: criteria.goal,
+            level: criteria.level,
+            equipments: criteria.equipments,
+            muscleGroup: 'cardio',
+            exerciseCategory: 'all',
+            routineBarbellExerciseCount: 0,
+        },
+        context: { excludedExerciseIds: criteria.excludedExerciseIds },
+    };
+    const selection = pickTrainerExercise(Object.assign(Object.assign({}, selectionParams), { withTrace: true }));
+    const cardioExercise = selection.exercise;
     if (!cardioExercise)
         return;
     const slot = {
@@ -586,7 +575,8 @@ const attachOptionalCardioToRoutine = ({ cardioPreference, cardioExercises, crit
     else
         routineExercises.push(slot);
     if (debugExerciseSelectionTrace) {
-        appendCardioExerciseSelectionTrace(exerciseSelectionTraces, {
+        exerciseSelectionTraces.push({
+            traceKind: 'cardio',
             routine,
             prescriptionIndex: cardioPreference === 'workout-start'
                 ? CARDIO_TRACE_INDEX_BEFORE_TEMPLATE
@@ -594,7 +584,7 @@ const attachOptionalCardioToRoutine = ({ cardioPreference, cardioExercises, crit
             selectedExerciseId: cardioExercise.id,
             equipments: criteria.equipments,
             level: criteria.level,
-            candidatePoolSize: cardioExercises.length,
+            trace: selection.trace,
         });
     }
 };
@@ -648,7 +638,7 @@ function generateProgram(params) {
             };
             let exercise;
             if (debugExerciseSelectionTrace) {
-                const selection = pickExerciseForPrescription({
+                const selection = pickTrainerExercise({
                     sortedExercises,
                     criteria,
                     context: {
@@ -671,7 +661,7 @@ function generateProgram(params) {
                 });
             }
             else {
-                exercise = pickExerciseForPrescription({
+                exercise = pickTrainerExercise({
                     sortedExercises,
                     criteria,
                     context: {
@@ -719,8 +709,8 @@ function generateProgram(params) {
         }
         attachOptionalCardioToRoutine({
             cardioPreference,
-            cardioExercises: sortedExercises.cardio,
-            criteria: { equipments, level, excludedExerciseIds },
+            sortedExercises,
+            criteria: { equipments, level, goal, frequency, excludedExerciseIds },
             debugExerciseSelectionTrace,
             exerciseSelectionTraces,
             routine,

package/built/index.d.ts

@@ -647,11 +647,12 @@ export declare const trainingGoals: readonly ["strength", "build_muscle", "fat_l
 export declare const trainingLevels: readonly ["beginner", "intermediate", "advanced"];
 export declare const exerciseCategories: readonly ["isolation", "compound", "assistance-compound"];
 export declare const restTimerLengths: readonly ["short", "medium", "long"];
+export declare const cardioPreferences: readonly ["no-cardio", "workout-start", "workout-end"];
 export type TrainingGoal = Lookup<typeof trainingGoals>;
 export type TrainingLevel = Lookup<typeof trainingLevels>;
 export type ExerciseCategory = Lookup<typeof exerciseCategories>;
 export type RestTimerLength = typeof restTimerLengths[number];
-export type CardioPreference = 'no-cardio' | 'workout-start' | 'workout-end';
+export type CardioPreference = typeof cardioPreferences[number];
 export type HevyTrainerProgramEquipment = Extract<Equipment, 'barbell' | 'dumbbell' | 'machine'>;
 export declare const hevyTrainerProgramEquipments: readonly ["barbell", "dumbbell", "machine"];
 export declare const granularEquipments: readonly ["barbell", "dumbbell", "kettlebell", "plate", "medicine_ball", "ez_bar", "landmine", "trap_bar", "pullup_bar", "dip_bar", "squat_rack", "flat_bench", "adjustable_bench", "dual_cable_machine", "single_cable_machine", "lat_pulldown_cable", "leg_press_machine", "smith_machine", "t_bar", "plate_machines", "stack_machines", "treadmill", "elliptical_trainer", "rowing_machine", "spinning", "stair_machine", "air_bike", "suspension_band", "resistance_band", "battle_rope", "rings", "jump_rope"];

package/built/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.weeklyTrainingFrequencies = exports.isGranularEquipment = exports.granularEquipments = exports.hevyTrainerProgramEquipments = exports.restTimerLengths = exports.exerciseCategories = exports.trainingLevels = exports.trainingGoals = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.parseClientAuthTokenResponse = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = void 0;
-exports.isOAuthScope = exports.supportedScopes = exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = void 0;
+exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.weeklyTrainingFrequencies = exports.isGranularEquipment = exports.granularEquipments = exports.hevyTrainerProgramEquipments = exports.cardioPreferences = exports.restTimerLengths = exports.exerciseCategories = exports.trainingLevels = exports.trainingGoals = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.parseClientAuthTokenResponse = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = void 0;
+exports.isOAuthScope = exports.supportedScopes = exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = exports.isHeartRateSamples = void 0;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./schemas"), exports);
 __exportStar(require("./constants"), exports);
@@ -230,6 +230,11 @@ exports.exerciseCategories = [
     'assistance-compound',
 ];
 exports.restTimerLengths = ['short', 'medium', 'long'];
+exports.cardioPreferences = [
+    'no-cardio',
+    'workout-start',
+    'workout-end',
+];
 exports.hevyTrainerProgramEquipments = [
     'barbell',
     'dumbbell',

package/built/tests/hevyTrainer.test.js

@@ -381,11 +381,11 @@ const chestOnlySorted = (exercises) => {
     }, {});
     return Object.assign(Object.assign({}, empty), { chest: exercises });
 };
-describe('pickExerciseForPrescription', () => {
+describe('pickTrainerExercise', () => {
     it('pass 1: returns the first matching exercise that is not used in the program', () => {
         const used = makeExercise({ id: 'used' });
         const fresh = makeExercise({ id: 'fresh' });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([used, fresh]),
             criteria: baseCriteria(),
             context: {
@@ -396,7 +396,7 @@ describe('pickExerciseForPrescription', () => {
     });
     it('pass 2: falls back to exercises not used in the current routine when all are used in the program', () => {
         const onlyExercise = makeExercise({ id: 'only' });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([onlyExercise]),
             criteria: baseCriteria(),
             context: {
@@ -411,7 +411,7 @@ describe('pickExerciseForPrescription', () => {
     it('excludes exercises in `excludedExerciseIds` across all passes', () => {
         const excluded = makeExercise({ id: 'excluded' });
         const alternative = makeExercise({ id: 'alt' });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([excluded, alternative]),
             criteria: baseCriteria(),
             context: {
@@ -421,7 +421,7 @@ describe('pickExerciseForPrescription', () => {
         expect(result === null || result === void 0 ? void 0 : result.id).toBe('alt');
     });
     it('returns undefined when no exercise satisfies any pass', () => {
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([]),
             criteria: baseCriteria(),
             context: {},
@@ -437,7 +437,7 @@ describe('pickExerciseForPrescription', () => {
             id: 'bw',
             granular_equipments: [],
         });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([needsBarbell, bodyweight]),
             criteria: baseCriteria({ equipments: [] }),
             context: {},
@@ -448,7 +448,7 @@ describe('pickExerciseForPrescription', () => {
         const wrongLevel = makeExercise({ id: 'wrong', level: ['advanced'] });
         const wrongGoal = makeExercise({ id: 'wrongGoal', goal: ['fat_loss'] });
         const rightOne = makeExercise({ id: 'right' });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([wrongLevel, wrongGoal, rightOne]),
             criteria: baseCriteria({ level: 'beginner', goal: 'strength' }),
             context: {},
@@ -458,7 +458,7 @@ describe('pickExerciseForPrescription', () => {
     it('considers handpicked exercises before sortedExercises', () => {
         const hand = makeExercise({ id: 'hand' });
         const sorted = makeExercise({ id: 'sorted' });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([sorted]),
             handPickedExercises: [hand],
             criteria: baseCriteria(),
@@ -473,7 +473,7 @@ describe('pickExerciseForPrescription', () => {
             id: 'compound',
             category: 'compound',
         });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([compoundOnly]),
             criteria: baseCriteria({ exerciseCategory: 'isolation' }),
             context: {},
@@ -491,7 +491,7 @@ describe('pickExerciseForPrescription', () => {
             return acc;
         }, {});
         sorted.shoulders = [secondaryChest];
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: sorted,
             criteria: baseCriteria({ muscleGroup: 'chest' }),
             context: {},
@@ -502,7 +502,7 @@ describe('pickExerciseForPrescription', () => {
         const barbellExercise = (id) => makeExercise({ id, equipment_category: 'barbell' });
         it('allows barbell exercises regardless of count when frequency > 1', () => {
             const ex = barbellExercise('bench');
-            const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+            const result = (0, hevyTrainer_1.pickTrainerExercise)({
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 3,
@@ -515,7 +515,7 @@ describe('pickExerciseForPrescription', () => {
         });
         it('allows barbell exercises under the cap when frequency === 1', () => {
             const ex = barbellExercise('bench');
-            const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+            const result = (0, hevyTrainer_1.pickTrainerExercise)({
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 1,
@@ -528,7 +528,7 @@ describe('pickExerciseForPrescription', () => {
         });
         it('rejects barbell exercises at or over the cap when a substitute is available', () => {
             const ex = barbellExercise('bench');
-            const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+            const result = (0, hevyTrainer_1.pickTrainerExercise)({
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 1,
@@ -542,7 +542,7 @@ describe('pickExerciseForPrescription', () => {
         });
         it('still allows barbell exercises over the cap when the user has no substitutes', () => {
             const ex = barbellExercise('bench');
-            const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+            const result = (0, hevyTrainer_1.pickTrainerExercise)({
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 1,
@@ -558,7 +558,7 @@ describe('pickExerciseForPrescription', () => {
     it('returns a trace when `withTrace: true` and records the winning pass', () => {
         var _a;
         const fresh = makeExercise({ id: 'fresh' });
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([fresh]),
             criteria: baseCriteria(),
             context: {},
@@ -572,7 +572,7 @@ describe('pickExerciseForPrescription', () => {
         });
     });
     it('returns a trace with no selected pass when nothing matches', () => {
-        const result = (0, hevyTrainer_1.pickExerciseForPrescription)({
+        const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([]),
             criteria: baseCriteria(),
             context: {},
@@ -899,7 +899,7 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         expect(result.exerciseSelectionTraces.map((t) => t.prescriptionIndex)).toEqual([0, 1]);
     });
-    it('records a single cardio trace entry (no multi-pass picker)', () => {
+    it('records a single cardio trace entry on pass 1', () => {
         const settings = makeSettings();
         settings.templates.full_body_1 = {
             exercises: [{ muscle_group: 'chest', category: 'compound' }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.984",
+  "version": "1.0.986",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
@@ -52,6 +52,6 @@
   "dependencies": {
     "dayjs": "^1.11.19",
     "lodash": "^4.17.21",
-    "zod": "3.24.3"
+    "zod": "3.24.2"
   }
 }