hevy-shared 1.0.979 → 1.0.981

package/built/hevyTrainer.js

@@ -565,7 +565,7 @@ const appendCardioExerciseSelectionTrace = (traces, params) => {
 };
 /** Inserts optional cardio before or after template exercises for one routine. */
 const attachOptionalCardioToRoutine = ({ cardioPreference, cardioExercises, criteria, debugExerciseSelectionTrace, exerciseSelectionTraces, routine, templatePrescriptionCount, routineExercises, }) => {
-    if (!cardioPreference)
+    if (cardioPreference === 'no-cardio')
         return;
     const cardioExercise = cardioExercises.find((ex) => {
         var _a, _b, _c;
@@ -581,14 +581,14 @@ const attachOptionalCardioToRoutine = ({ cardioPreference, cardioExercises, crit
         exerciseTemplate: cardioExercise,
         durationSeconds: exports.DEFAULT_TRAINER_CARDIO_ATTACHMENT_DURATION_SECONDS,
     };
-    if (cardioPreference === 'beginning')
+    if (cardioPreference === 'workout-start')
         routineExercises.unshift(slot);
     else
         routineExercises.push(slot);
     if (debugExerciseSelectionTrace) {
         appendCardioExerciseSelectionTrace(exerciseSelectionTraces, {
             routine,
-            prescriptionIndex: cardioPreference === 'beginning'
+            prescriptionIndex: cardioPreference === 'workout-start'
                 ? CARDIO_TRACE_INDEX_BEFORE_TEMPLATE
                 : templatePrescriptionCount,
             selectedExerciseId: cardioExercise.id,

package/built/index.d.ts

@@ -650,7 +650,7 @@ 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 = undefined | 'beginning' | 'end';
+export type CardioPreference = 'no-cardio' | 'workout-start' | 'workout-end';
 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/tests/hevyTrainer.test.js

@@ -608,7 +608,7 @@ describe('generateProgram', () => {
             workoutDurationMinutes: 60,
             restTimerLength: 'medium',
             exerciseStore: [chestExercise],
-            cardioPreference: undefined,
+            cardioPreference: 'no-cardio',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -646,7 +646,7 @@ describe('generateProgram', () => {
             workoutDurationMinutes: 60,
             restTimerLength: 'medium',
             exerciseStore: [],
-            cardioPreference: undefined,
+            cardioPreference: 'no-cardio',
         });
         expect(result.success).toBe(false);
         if (result.success)
@@ -688,7 +688,7 @@ describe('generateProgram', () => {
                 workoutDurationMinutes,
                 restTimerLength: 'medium',
                 exerciseStore: [makeExercise({ id: 'bench' })],
-                cardioPreference: undefined,
+                cardioPreference: 'no-cardio',
             });
             const routine = (result.success ? result.program : result.partialProgram)
                 .routines[0];
@@ -757,7 +757,7 @@ describe('generateProgram', () => {
                     makeExercise({ id: 'bench-2', priority: 2 }),
                     makeExercise({ id: 'bench-3', priority: 1 }),
                 ],
-                cardioPreference: undefined,
+                cardioPreference: 'no-cardio',
             });
             expect(result.success).toBe(true);
             if (!result.success)
@@ -787,7 +787,7 @@ describe('generateProgram', () => {
             exerciseStore: [
                 makeExercise({ id: 'biceps-curl', muscle_group: 'biceps' }),
             ],
-            cardioPreference: undefined,
+            cardioPreference: 'no-cardio',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -814,7 +814,7 @@ describe('generateProgram', () => {
             restTimerLength: 'medium',
             exerciseStore: [bicepsCurl],
             focusMuscle: 'arms',
-            cardioPreference: undefined,
+            cardioPreference: 'no-cardio',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -840,7 +840,7 @@ describe('generateProgram', () => {
             restTimerLength: 'medium',
             exerciseStore: [excluded, alt],
             excludedExerciseIds: new Set(['excluded']),
-            cardioPreference: undefined,
+            cardioPreference: 'no-cardio',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -860,7 +860,7 @@ describe('generateProgram', () => {
             restTimerLength: 'medium',
             exerciseStore: [chest],
             debugExerciseSelectionTrace: true,
-            cardioPreference: undefined,
+            cardioPreference: 'no-cardio',
         });
         expect(result.success).toBe(true);
         expect(result.exerciseSelectionTraces).toHaveLength(1);
@@ -894,7 +894,7 @@ describe('generateProgram', () => {
                 makeExercise({ id: 'bench-2' }),
             ],
             debugExerciseSelectionTrace: true,
-            cardioPreference: undefined,
+            cardioPreference: 'no-cardio',
         });
         expect(result.success).toBe(true);
         expect(result.exerciseSelectionTraces.map((t) => t.prescriptionIndex)).toEqual([0, 1]);
@@ -924,7 +924,7 @@ describe('generateProgram', () => {
                 }),
             ],
             debugExerciseSelectionTrace: true,
-            cardioPreference: 'beginning',
+            cardioPreference: 'workout-start',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -966,7 +966,7 @@ describe('generateProgram', () => {
                     equipment_category: 'other',
                 }),
             ],
-            cardioPreference: 'beginning',
+            cardioPreference: 'workout-start',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -1011,7 +1011,7 @@ describe('generateProgram', () => {
                     equipment_category: 'other',
                 }),
             ],
-            cardioPreference: 'beginning',
+            cardioPreference: 'workout-start',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -1052,7 +1052,7 @@ describe('generateProgram', () => {
                 }),
             ],
             excludedExerciseIds: new Set(['run-a']),
-            cardioPreference: 'beginning',
+            cardioPreference: 'workout-start',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -1091,7 +1091,7 @@ describe('generateProgram', () => {
                 }),
             ],
             debugExerciseSelectionTrace: true,
-            cardioPreference: 'beginning',
+            cardioPreference: 'workout-start',
         });
         expect(result.success).toBe(true);
         if (!result.success)
@@ -1128,7 +1128,7 @@ describe('generateProgram', () => {
                 workoutDurationMinutes: 60,
                 restTimerLength: 'medium',
                 exerciseStore: exercises,
-                cardioPreference: undefined,
+                cardioPreference: 'no-cardio',
             });
             expect(result.success).toBe(false);
             if (result.success)
@@ -1159,7 +1159,7 @@ describe('generateProgram', () => {
                 workoutDurationMinutes: 60,
                 restTimerLength: 'medium',
                 exerciseStore: exercises,
-                cardioPreference: undefined,
+                cardioPreference: 'no-cardio',
             });
             expect(result.success).toBe(true);
             if (!result.success)
@@ -1213,7 +1213,7 @@ describe('generateProgram', () => {
                 exerciseStore: exercises,
                 focusMuscle: 'arms',
                 debugExerciseSelectionTrace: true,
-                cardioPreference: undefined,
+                cardioPreference: 'no-cardio',
             });
             const traces = result.exerciseSelectionTraces;
             // Counter increments once per placed focus_muscle prescription, so the
@@ -1271,7 +1271,7 @@ describe('generateProgram', () => {
                 exerciseStore: exercises,
                 focusMuscle: 'legs',
                 debugExerciseSelectionTrace: true,
-                cardioPreference: undefined,
+                cardioPreference: 'no-cardio',
             });
             expect(result.success).toBe(true);
             if (!result.success)
@@ -1311,7 +1311,7 @@ describe('generateProgram', () => {
                 exerciseStore: [candidateExercise],
                 focusMuscle,
                 debugExerciseSelectionTrace: true,
-                cardioPreference: undefined,
+                cardioPreference: 'no-cardio',
             });
             // Find the routine we targeted (it may not be first in the split).
             const routine = (result.success ? result.program : result.partialProgram).routines.find((r) => r.name === routineName);

package/package.json

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