hevy-shared 1.0.733 → 1.0.735

package/built/hevyTrainer.d.ts

@@ -6,7 +6,7 @@ export declare const hevyTrainerExerciseCategories: readonly ["compound", "isola
 export declare const routineNames: readonly ["full_body_1", "full_body_2_a", "full_body_2_b", "full_body_3_a", "full_body_3_b", "full_body_3_c", "upper_1_a", "lower_1_a", "upper_1_b", "lower_1_b", "push_1", "pull_1", "legs_1", "upper_2", "lower_2", "push_2_a", "pull_2_a", "legs_2_a", "push_2_b", "pull_2_b", "legs_2_b"];
 export type exerciseId = string;
 export interface ExerciseSelectionCriteria {
-    exerciseCategory: HevyTrainerExerciseCategory;
+    exerciseCategory: HevyTrainerExerciseCategory | 'all';
     equipments: HevyTrainerProgramEquipment[];
     routineBarbellExerciseCount: number;
     level: TrainingLevel;

package/built/hevyTrainer.js

@@ -164,7 +164,8 @@ const getMuscleGroup = ({ muscleGroupPrescription, programFocusMuscleExerciseCou
  */
 const isExerciseMatch = (exercise, criteria) => {
     var _a, _b, _c, _d;
-    const categoryMatch = exercise.category === criteria.exerciseCategory ||
+    const categoryMatch = criteria.exerciseCategory === 'all' ||
+        exercise.category === criteria.exerciseCategory ||
         (exercise.category === 'assistance-compound' &&
             criteria.exerciseCategory === 'compound');
     const levelMatch = (_b = (_a = exercise.level) === null || _a === void 0 ? void 0 : _a.includes(criteria.level)) !== null && _b !== void 0 ? _b : false;
@@ -235,15 +236,15 @@ const pickExerciseForPrescription = (params) => {
     if (exercise)
         return exercise;
     // 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);
+    exercise = findMatchingExercise(exercises, Object.assign(Object.assign({}, criteria), { exerciseCategory: 'all' }), 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)
+    // is in the exercise's other muscles, also ignores exercise category
+    const secondaryMuscleExercises = Object.values(sortedExercises)
         .flat()
         .filter((e) => e.other_muscles.includes(criteria.muscleGroup));
-    exercise = findMatchingExercise(otherMuscles, criteria, routineContext);
+    exercise = findMatchingExercise(secondaryMuscleExercises, Object.assign(Object.assign({}, criteria), { exerciseCategory: 'all' }), routineContext);
     return exercise;
 };
 exports.pickExerciseForPrescription = pickExerciseForPrescription;

package/built/index.d.ts

@@ -1749,15 +1749,21 @@ export interface UserPushNotificationSettingsUpdate {
     likes?: boolean;
     monthly_report?: boolean;
 }
-export interface AvailableEquipment {
-    platesKg: number[];
-    platesLbs: number[];
-    barsKg: number[];
-    barsLbs: number[];
-    dumbbellsKg: number[];
-    dumbbellsLbs: number[];
+export interface ProgressiveOverloadSettings {
+    plate: {
+        kg: number;
+        lbs: number;
+    };
+    dumbbell: {
+        kg: number;
+        lbs: number;
+    };
+    machine: {
+        kg: number;
+        lbs: number;
+    };
 }
 export interface HevyTrainerUserPreferences {
+    progressiveOverloadSettings: ProgressiveOverloadSettings;
     excludedExercisesIds: string[];
-    availableEquipment: AvailableEquipment;
 }

package/package.json

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