hevy-shared 1.0.912 → 1.0.914

package/built/hevyTrainer.d.ts

@@ -9,6 +9,11 @@ export declare const granularEquipmentDefaults: {
     [key in TrainerGymType]: GranularEquipment[];
 };
 export declare const trainerEquipmentToGranularEquipments: (equipments: HevyTrainerProgramEquipment[]) => GranularEquipment[];
+/**
+ * Converts granular equipment values back to the old HevyTrainerProgramEquipment
+ * types for backwards compatibility with old mobile clients.
+ */
+export declare const granularEquipmentsToTrainerEquipments: (granularEquipments: GranularEquipment[]) => HevyTrainerProgramEquipment[];
 export declare const hevyTrainerExerciseCategories: readonly ["compound", "isolation"];
 export declare const defaultDurationPerFrequency: Record<WeeklyTrainingFrequency, WorkoutDurationMinutes>;
 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"];
@@ -142,6 +147,13 @@ export declare const normalizeExerciseCategory: (exercise: {
     is_custom: boolean;
     category?: ExerciseCategory;
 }) => HevyTrainerExerciseCategory;
+/**
+ * Checks if an exercise is compatible with the user's selected granular equipments
+ *
+ * - If the exercise has no granular equipments, it is compatible no matter what the user has selected
+ * - Otherwise, the exercise is only allowed if the user has all the granular equipments
+ */
+export declare const isEquipmentCompatible: (exercise: HevyTrainerLibraryExercise, userSelectedGranularEquipments: GranularEquipment[]) => boolean;
 /**
  * Sorts exercises by priority for each muscle group based on the provided priorities
  * and adds any remaining exercises from the store that weren't in the priorities.

package/built/hevyTrainer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateProgram = exports.pickExerciseForPrescription = exports.getPrioritySortedExercises = exports.normalizeExerciseCategory = exports.getTrainerRestTimerSeconds = exports.getTrainerRepRange = exports.getTrainerSetCount = exports.programSplits = exports.frequencyMap = exports.routineNames = exports.defaultDurationPerFrequency = exports.hevyTrainerExerciseCategories = exports.trainerEquipmentToGranularEquipments = exports.granularEquipmentDefaults = exports.trainerGymTypes = exports.workoutDurationOptions = void 0;
+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];
@@ -80,53 +80,27 @@ const trainerEquipmentToGranularEquipmentsMap = {
     barbell: [
         'adjustable_bench',
         'barbell',
-        'dip_bar',
         'ez_bar',
         'flat_bench',
         'landmine',
-        'medicine_ball',
         'plate',
-        'pullup_bar',
-        'rings',
-        'rope',
         'squat_rack',
         't_bar',
-        'trap_bar',
-    ],
-    dumbbell: [
-        'adjustable_bench',
-        'dip_bar',
-        'dumbbell',
-        'flat_bench',
-        'medicine_ball',
-        'pullup_bar',
-        'rings',
-        'rope',
     ],
+    dumbbell: ['adjustable_bench', 'dumbbell', 'flat_bench'],
     machine: [
         'adjustable_bench',
-        'air_bike',
-        'battle_rope',
         'dip_bar',
         'dual_cable_machine',
-        'elliptical_trainer',
         'flat_bench',
         'lat_pulldown_cable',
         'leg_press_machine',
-        'medicine_ball',
         'plate',
         'plate_machines',
         'pullup_bar',
-        'resistance_band',
-        'rings',
-        'rope',
-        'rowing_machine',
         'single_cable_machine',
         'smith_machine',
-        'spinning',
         'stack_machines',
-        'stair_machine',
-        'treadmill',
     ],
 };
 const trainerEquipmentToGranularEquipments = (equipments) => {
@@ -137,6 +111,35 @@ const trainerEquipmentToGranularEquipments = (equipments) => {
     return Array.from(new Set(granularEquipments));
 };
 exports.trainerEquipmentToGranularEquipments = trainerEquipmentToGranularEquipments;
+const MACHINE_SPECIFIC_GRANULAR_EQUIPMENTS = [
+    'smith_machine',
+    'leg_press_machine',
+    'dual_cable_machine',
+    'single_cable_machine',
+    'lat_pulldown_cable',
+    'plate_machines',
+    'stack_machines',
+    'dip_bar',
+    'pullup_bar',
+];
+/**
+ * Converts granular equipment values back to the old HevyTrainerProgramEquipment
+ * types for backwards compatibility with old mobile clients.
+ */
+const granularEquipmentsToTrainerEquipments = (granularEquipments) => {
+    const result = [];
+    if (granularEquipments.includes('barbell')) {
+        result.push('barbell');
+    }
+    if (granularEquipments.includes('dumbbell')) {
+        result.push('dumbbell');
+    }
+    if (granularEquipments.some((eq) => MACHINE_SPECIFIC_GRANULAR_EQUIPMENTS.includes(eq))) {
+        result.push('machine');
+    }
+    return result;
+};
+exports.granularEquipmentsToTrainerEquipments = granularEquipmentsToTrainerEquipments;
 exports.hevyTrainerExerciseCategories = ['compound', 'isolation'];
 // These are the values that Philip decided for the default duration per frequency
 exports.defaultDurationPerFrequency = {
@@ -263,8 +266,18 @@ const isEquipmentCompatible = (exercise, userSelectedGranularEquipments) => {
         exercise.granular_equipments.length === 0) {
         return true;
     }
-    return exercise.granular_equipments.every((granularEquipment) => userSelectedGranularEquipments.includes(granularEquipment));
+    const allowedEquipments = [...userSelectedGranularEquipments];
+    // Special case: adjustable bench can substitute for flat bench
+    if (userSelectedGranularEquipments.includes('adjustable_bench')) {
+        allowedEquipments.push('flat_bench');
+    }
+    // Special case: dual cable machine can substitute for single cable machine
+    if (userSelectedGranularEquipments.includes('dual_cable_machine')) {
+        allowedEquipments.push('single_cable_machine');
+    }
+    return exercise.granular_equipments.every((granularEquipment) => allowedEquipments.includes(granularEquipment));
 };
+exports.isEquipmentCompatible = isEquipmentCompatible;
 /**
  * Checks if the routine barbell exercise limit is exceeded
  *
@@ -364,7 +377,7 @@ const isExerciseMatch = (exercise, criteria) => {
             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;
     const goalMatch = (_d = (_c = exercise.goal) === null || _c === void 0 ? void 0 : _c.includes(criteria.goal)) !== null && _d !== void 0 ? _d : false;
-    const equipmentMatch = isEquipmentCompatible(exercise, criteria.granularEquipments);
+    const equipmentMatch = (0, exports.isEquipmentCompatible)(exercise, criteria.granularEquipments);
     const barbellLimitOk = !isBarbellLimitExceeded(exercise, criteria.routineBarbellExerciseCount, criteria.granularEquipments);
     return (categoryMatch && levelMatch && goalMatch && equipmentMatch && barbellLimitOk);
 };
@@ -375,7 +388,7 @@ const isAlternativeIsolationExerciseMatch = (exercise, criteria) => {
     var _a, _b;
     const isIsolationCategory = criteria.exerciseCategory === 'isolation';
     const isAlternativeExercise = isolationExerciseAlternatives[criteria.muscleGroup].includes(exercise.id);
-    const equipmentMatch = isEquipmentCompatible(exercise, criteria.granularEquipments);
+    const equipmentMatch = (0, exports.isEquipmentCompatible)(exercise, criteria.granularEquipments);
     const levelMatch = (_b = (_a = exercise.level) === null || _a === void 0 ? void 0 : _a.includes(criteria.level)) !== null && _b !== void 0 ? _b : false;
     return (isIsolationCategory && isAlternativeExercise && equipmentMatch && levelMatch);
 };

package/built/tests/hevyTrainer.test.js

@@ -11,59 +11,33 @@ describe('trainerEquipmentToGranularEquipments', () => {
         expect(sortGranular(result)).toEqual(sortGranular([
             'adjustable_bench',
             'barbell',
-            'dip_bar',
             'ez_bar',
             'flat_bench',
             'landmine',
-            'medicine_ball',
             'plate',
-            'pullup_bar',
-            'rings',
-            'rope',
             'squat_rack',
             't_bar',
-            'trap_bar',
         ]));
     });
     it('returns expected granular equipments for dumbbell only', () => {
         const result = (0, hevyTrainer_1.trainerEquipmentToGranularEquipments)(['dumbbell']);
-        expect(sortGranular(result)).toEqual(sortGranular([
-            'adjustable_bench',
-            'dip_bar',
-            'dumbbell',
-            'flat_bench',
-            'medicine_ball',
-            'pullup_bar',
-            'rings',
-            'rope',
-        ]));
+        expect(sortGranular(result)).toEqual(sortGranular(['adjustable_bench', 'dumbbell', 'flat_bench']));
     });
     it('returns expected granular equipments for machine only', () => {
         const result = (0, hevyTrainer_1.trainerEquipmentToGranularEquipments)(['machine']);
         expect(sortGranular(result)).toEqual(sortGranular([
             'adjustable_bench',
-            'air_bike',
-            'battle_rope',
             'dip_bar',
             'dual_cable_machine',
-            'elliptical_trainer',
             'flat_bench',
             'lat_pulldown_cable',
             'leg_press_machine',
-            'medicine_ball',
             'plate',
             'plate_machines',
             'pullup_bar',
-            'resistance_band',
-            'rings',
-            'rope',
-            'rowing_machine',
             'single_cable_machine',
             'smith_machine',
-            'spinning',
             'stack_machines',
-            'stair_machine',
-            'treadmill',
         ]));
     });
     it('returns deduped union for multiple equipments', () => {
@@ -75,6 +49,53 @@ describe('trainerEquipmentToGranularEquipments', () => {
         expect(sortGranular(result)).toEqual(combined);
     });
 });
+const createExercise = (granularEquipments) => ({
+    id: 'test-exercise',
+    title: 'Test Exercise',
+    granular_equipments: granularEquipments,
+});
+describe('isEquipmentCompatible', () => {
+    it('returns true when exercise has no granular equipments', () => {
+        const exercise = createExercise(undefined);
+        expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['barbell'])).toBe(true);
+    });
+    it('returns true when exercise has empty granular equipments', () => {
+        const exercise = createExercise([]);
+        expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['barbell'])).toBe(true);
+    });
+    it('returns true when user has all required equipments', () => {
+        const exercise = createExercise(['barbell', 'squat_rack']);
+        expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['barbell', 'squat_rack'])).toBe(true);
+    });
+    it('returns false when user is missing required equipment', () => {
+        const exercise = createExercise(['barbell', 'squat_rack']);
+        expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['barbell'])).toBe(false);
+    });
+    it('returns true when user has more equipment than required', () => {
+        const exercise = createExercise(['barbell']);
+        expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['barbell', 'squat_rack', 'dumbbell'])).toBe(true);
+    });
+    describe('special case: adjustable_bench / flat_bench substitution', () => {
+        it('allows adjustable_bench to substitute for flat_bench when exercise requires flat_bench', () => {
+            const exercise = createExercise(['flat_bench']);
+            expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['adjustable_bench'])).toBe(true);
+        });
+        it('does NOT allow flat_bench to substitute for adjustable_bench when exercise requires adjustable_bench', () => {
+            const exercise = createExercise(['adjustable_bench']);
+            expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['flat_bench'])).toBe(false);
+        });
+    });
+    describe('special case: dual_cable_machine / single_cable_machine substitution', () => {
+        it('allows dual_cable_machine to substitute for single_cable_machine when exercise requires single_cable_machine', () => {
+            const exercise = createExercise(['single_cable_machine']);
+            expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['dual_cable_machine'])).toBe(true);
+        });
+        it('does NOT allow single_cable_machine to substitute for dual_cable_machine when exercise requires dual_cable_machine', () => {
+            const exercise = createExercise(['dual_cable_machine']);
+            expect((0, hevyTrainer_1.isEquipmentCompatible)(exercise, ['single_cable_machine'])).toBe(false);
+        });
+    });
+});
 const __1 = require("..");
 describe('hevyTrainer gym types and defaults', () => {
     it('defines granular equipment defaults for every trainer gym type', () => {

package/package.json

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