hevy-shared 1.0.727 → 1.0.729

package/built/hevyTrainer.js

@@ -61,12 +61,26 @@ const getTrainerRestTimerSeconds = (preset, goal, exerciseCategory) => {
     return preset.settings.rest_timers[goal][exerciseCategory];
 };
 exports.getTrainerRestTimerSeconds = getTrainerRestTimerSeconds;
-// Utility functions for better code organization
+/**
+ * Checks if an exercise is compatible with the user's equipments
+ *
+ * - We enable plate exercises where users have barbell as an equipment
+ * - None and other equipment categories are also always allowed
+ * - Otherwise, the exercise is only allowed if the user has that equipment
+ */
 const isEquipmentCompatible = (exercise, allowedEquipments) => {
     return (allowedEquipments.includes(exercise.equipment_category) ||
         exercise.equipment_category === 'none' ||
-        exercise.equipment_category === 'other');
+        exercise.equipment_category === 'other' ||
+        (exercise.equipment_category === 'plate' &&
+            allowedEquipments.includes('barbell')));
 };
+/**
+ * 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
+ */
 const isBarbellLimitExceeded = (exercise, routineBarbellExerciseCount, allowedEquipments) => {
     return (exercise.equipment_category === 'barbell' &&
         routineBarbellExerciseCount >= MAX_BARBELL_EXERCISES_PER_ROUTINE &&
@@ -80,7 +94,7 @@ const isExerciseUsed = (exercise, context) => {
         false);
 };
 const isolationExerciseAlternatives = {
-    chest: ['B74A95BB', '392887AA', '39C99849'],
+    chest: ['B74A95BB', '392887AA', '39C99849', '982734D4'],
     triceps: ['6575F52D', 'CD6DC8E5'],
     quadriceps: ['32HKJ34K', 'A733CC5B', '9694DA61'],
     hamstrings: ['F6948F17', '487B3755', 'CDA23948'],
@@ -220,10 +234,16 @@ const pickExerciseForPrescription = (params) => {
     exercise = findAlternativeIsolationExercise(exercises, criteria, routineContext);
     if (exercise)
         return exercise;
-    // Pass 5: Find compound exercise that uses the same muscle group as the isolation exercise
-    if (criteria.exerciseCategory === 'isolation') {
-        exercise = findMatchingExercise(exercises, Object.assign(Object.assign({}, criteria), { exerciseCategory: 'compound' }), routineContext);
-    }
+    // Pass 5: Find exercise regardless of exercise category (isolation or compound)
+    exercise = findMatchingExercise(exercises, Object.assign(Object.assign({}, criteria), { exerciseCategory: criteria.exerciseCategory === 'isolation' ? 'compound' : 'isolation' }), routineContext);
+    if (exercise)
+        return exercise;
+    // Pass 6: Find exercises where the prescription muscle group
+    // is in the exercise's other muscles
+    const otherMuscles = Object.values(sortedExercises)
+        .flat()
+        .filter((e) => e.other_muscles.includes(criteria.muscleGroup));
+    exercise = findMatchingExercise(otherMuscles, criteria, routineContext);
     return exercise;
 };
 exports.pickExerciseForPrescription = pickExerciseForPrescription;

package/package.json

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