hevy-shared 1.0.924 → 1.0.926

package/built/hevyTrainer.d.ts

@@ -25,6 +25,7 @@ export interface ExerciseSelectionCriteria {
     level: TrainingLevel;
     goal: TrainingGoal;
     muscleGroup: MuscleGroup;
+    frequency: WeeklyTrainingFrequency;
 }
 export interface ExerciseSelectionContext {
     programUsedExerciseIds?: Set<string>;
@@ -195,7 +196,7 @@ export interface TrainerProgramResult {
 export interface TrainerProgramError {
     success: false;
     errors: ExercisePrescriptionError[];
-    partialProgram?: TrainerProgram;
+    partialProgram: TrainerProgram;
 }
 export type TrainerProgramAttempt = TrainerProgramResult | TrainerProgramError;
 /**

package/built/hevyTrainer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateProgram = exports.pickExerciseForPrescription = 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;
 const _1 = require(".");
-const MAX_BARBELL_EXERCISES_PER_ROUTINE = 2;
 exports.workoutDurationOptions = [40, 60, 80];
 exports.trainerGymTypes = [
     'home_gym',
@@ -71,6 +70,7 @@ exports.granularEquipmentDefaults = {
         'stair_machine',
         'air_bike',
         'suspension_band',
+        'resistance_band',
         'battle_rope',
         'rings',
         'jump_rope',
@@ -278,16 +278,32 @@ const isEquipmentCompatible = (exercise, userSelectedGranularEquipments) => {
     return exercise.granular_equipments.every((granularEquipment) => allowedEquipments.includes(granularEquipment));
 };
 exports.isEquipmentCompatible = isEquipmentCompatible;
+const MAX_BARBELL_EXERCISES_FOR_ONCE_PER_WEEK = 3;
 /**
- * Checks if the routine barbell exercise limit is exceeded
- *
- * - We allow up to 2 barbell exercises per routine
- * - Unless the user ONLY has barbell as an allowed equipment
+ * - If frequency is 1 and the candidate exercise is a barbell exercise
+ * - Then allow at most `MAX_BARBELL_EXERCISES_FOR_ONCE_PER_WEEK` barbell exercises
+ * - Only enforce the cap when the user has at least one "barbell substitute" equipment available
+ *   (otherwise we allow barbell exercises to avoid running out of viable options)
  */
-const isBarbellLimitExceeded = (exercise, routineBarbellExerciseCount, allowedEquipments) => {
-    return (exercise.equipment_category === 'barbell' &&
-        routineBarbellExerciseCount >= MAX_BARBELL_EXERCISES_PER_ROUTINE &&
-        allowedEquipments.length > 1);
+const isBarbellExerciseAllowed = (exercise, routineBarbellExerciseCount, userEquipments, frequency) => {
+    const isCandidateBarbell = exercise.equipment_category === 'barbell';
+    const isOncePerWeek = frequency === 1;
+    if (!isCandidateBarbell || !isOncePerWeek)
+        return true;
+    const isAtOrOverLimit = routineBarbellExerciseCount >= MAX_BARBELL_EXERCISES_FOR_ONCE_PER_WEEK;
+    if (!isAtOrOverLimit)
+        return true;
+    const barbellSubstitutes = [
+        'dumbbell',
+        'dual_cable_machine',
+        'single_cable_machine',
+        'smith_machine',
+        'plate_machines',
+        'stack_machines',
+    ];
+    const hasAnySubstitute = barbellSubstitutes.some((substitute) => userEquipments.includes(substitute));
+    // If the user has substitutes, enforce the cap; otherwise allow barbell to avoid dead-ends.
+    return !hasAnySubstitute;
 };
 const isExerciseUsed = (exercise, context) => {
     var _a, _b, _c;
@@ -297,9 +313,29 @@ const isExerciseUsed = (exercise, context) => {
         false);
 };
 const isolationExerciseAlternatives = {
+    /**
+     * - B74A95BB (Kneeling Push Up)
+     * - 392887AA (Push Up)
+     * - 39C99849 (Incline Push Ups)
+     * - 982734D4 (Plate Press)
+     */
     chest: ['B74A95BB', '392887AA', '39C99849', '982734D4'],
+    /**
+     * - 6575F52D (Diamond Push Up)
+     * - CD6DC8E5 (Bench Dip)
+     */
     triceps: ['6575F52D', 'CD6DC8E5'],
+    /**
+     * - 32HKJ34K (Walking Lunge)
+     * - A733CC5B (Walking Lunge (Dumbbell))
+     * - 9694DA61 (Squat (Bodyweight))
+     */
     quadriceps: ['32HKJ34K', 'A733CC5B', '9694DA61'],
+    /**
+     * - F6948F17 (Frog Pumps (Dumbbell))
+     * - 487B3755 (Single Leg Hip Thrust)
+     * - CDA23948 (Glute Bridge)
+     */
     hamstrings: ['F6948F17', '487B3755', 'CDA23948'],
     glutes: [],
     lats: [],
@@ -378,7 +414,7 @@ const isExerciseMatch = (exercise, criteria) => {
     const levelMatch = (_b = (_a = exercise.level) === null || _a === void 0 ? void 0 : _a.includes(criteria.level)) !== null && _b !== void 0 ? _b : false;
     const goalMatch = (_d = (_c = exercise.goal) === null || _c === void 0 ? void 0 : _c.includes(criteria.goal)) !== null && _d !== void 0 ? _d : false;
     const equipmentMatch = (0, exports.isEquipmentCompatible)(exercise, criteria.equipments);
-    const barbellLimitOk = !isBarbellLimitExceeded(exercise, criteria.routineBarbellExerciseCount, criteria.equipments);
+    const barbellLimitOk = isBarbellExerciseAllowed(exercise, criteria.routineBarbellExerciseCount, criteria.equipments, criteria.frequency);
     return (categoryMatch && levelMatch && goalMatch && equipmentMatch && barbellLimitOk);
 };
 /**
@@ -500,6 +536,7 @@ const generateProgram = (params) => {
             const exercise = (0, exports.pickExerciseForPrescription)({
                 sortedExercises,
                 criteria: {
+                    frequency: selectedDays,
                     exerciseCategory: exercisePrescription.category,
                     equipments: selectedEquipments,
                     muscleGroup,
@@ -559,7 +596,7 @@ const generateProgram = (params) => {
         return {
             success: false,
             errors: allErrors,
-            partialProgram: program.routines.length > 0 ? program : undefined,
+            partialProgram: program,
         };
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.924",
+  "version": "1.0.926",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",