hevy-shared 1.0.935 → 1.0.937

package/built/hevyTrainer.d.ts

@@ -1,8 +1,10 @@
-import { WeeklyTrainingFrequency, TrainingGoal, TrainingLevel, SimplifiedMuscleGroup, MuscleGroup, LibraryExercise, ExerciseCategory, GranularEquipment, HevyTrainerProgramEquipment } from '.';
+import { WeeklyTrainingFrequency, TrainingGoal, TrainingLevel, SimplifiedMuscleGroup, MuscleGroup, LibraryExercise, ExerciseCategory, GranularEquipment, HevyTrainerProgramEquipment, RestTimerLength } from '.';
 export type HevyTrainerExerciseCategory = typeof hevyTrainerExerciseCategories[number];
 export type HevyTrainerRoutineName = typeof routineNames[number];
 export declare const workoutDurationOptions: readonly [40, 60, 80];
 export type WorkoutDurationMinutes = typeof workoutDurationOptions[number];
+export declare const trainingGoalLengths: readonly ["strength_short", "strength_default", "strength_long", "build_muscle_short", "build_muscle_default", "build_muscle_long", "fat_loss_short", "fat_loss_default", "fat_loss_long"];
+export type TrainingGoalLength = typeof trainingGoalLengths[number];
 export declare const trainerGymTypes: readonly ["home_gym", "garage_gym", "commercial_gym", "full_gym"];
 export type TrainerGymType = typeof trainerGymTypes[number];
 export declare const granularEquipmentDefaults: {
@@ -45,6 +47,7 @@ export interface ProgramGenerationParams<T extends HevyTrainerLibraryExercise> {
     selectedLevel: TrainingLevel;
     selectedEquipments: GranularEquipment[];
     selectedWorkoutDurationMinutes?: WorkoutDurationMinutes;
+    selectedRestTimerLength: RestTimerLength;
     exerciseStore: T[];
     focusMuscle?: SimplifiedMuscleGroup;
     excludedExerciseIds?: Set<string>;
@@ -72,7 +75,7 @@ export type RestTimersPerCategory = {
     [key in HevyTrainerExerciseCategory]: number;
 };
 export type RestTimers = {
-    [key in TrainingGoal]: RestTimersPerCategory;
+    [key in TrainingGoalLength]: RestTimersPerCategory;
 };
 export type ExercisePriorities = {
     [key in MuscleGroup]: exerciseId[];
@@ -135,7 +138,8 @@ export interface TrainerProgram {
 }
 export declare const getTrainerSetCount: (trainerAlgorithmSettings: TrainerAlgorithmSettings, goal: TrainingGoal, frequency: WeeklyTrainingFrequency) => number;
 export declare const getTrainerRepRange: (trainerAlgorithmSettings: TrainerAlgorithmSettings, goal: TrainingGoal, exerciseCategory: HevyTrainerExerciseCategory) => RepRange;
-export declare const getTrainerRestTimerSeconds: (trainerAlgorithmSettings: TrainerAlgorithmSettings, goal: TrainingGoal, exerciseCategory: HevyTrainerExerciseCategory) => number;
+export declare const getTrainerRestTimerSeconds: (trainerAlgorithmSettings: TrainerAlgorithmSettings, restTimerLength: TrainingGoalLength, exerciseCategory: HevyTrainerExerciseCategory) => number;
+export declare const getRestTimerLength: (goal: TrainingGoal, length: RestTimerLength) => TrainingGoalLength;
 /**
  * Normalizes the exercise category to a HevyTrainerExerciseCategory
  * - Treat custom exercises and exercises with no category as `compound`

package/built/hevyTrainer.js

@@ -1,8 +1,19 @@
 "use strict";
 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;
+exports.generateProgram = exports.pickExerciseForPrescription = exports.getPrioritySortedExercises = exports.isEquipmentCompatible = exports.normalizeExerciseCategory = exports.getRestTimerLength = 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.trainingGoalLengths = exports.workoutDurationOptions = void 0;
 const _1 = require(".");
 exports.workoutDurationOptions = [40, 60, 80];
+exports.trainingGoalLengths = [
+    'strength_short',
+    'strength_default',
+    'strength_long',
+    'build_muscle_short',
+    'build_muscle_default',
+    'build_muscle_long',
+    'fat_loss_short',
+    'fat_loss_default',
+    'fat_loss_long',
+];
 exports.trainerGymTypes = [
     'home_gym',
     'garage_gym',
@@ -203,10 +214,35 @@ const getTrainerRepRange = (trainerAlgorithmSettings, goal, exerciseCategory) =>
     return trainerAlgorithmSettings.rep_ranges[goal][exerciseCategory];
 };
 exports.getTrainerRepRange = getTrainerRepRange;
-const getTrainerRestTimerSeconds = (trainerAlgorithmSettings, goal, exerciseCategory) => {
-    return trainerAlgorithmSettings.rest_timers[goal][exerciseCategory];
+const getTrainerRestTimerSeconds = (trainerAlgorithmSettings, restTimerLength, exerciseCategory) => {
+    return trainerAlgorithmSettings.rest_timers[restTimerLength][exerciseCategory];
 };
 exports.getTrainerRestTimerSeconds = getTrainerRestTimerSeconds;
+const getRestTimerLength = (goal, length) => {
+    switch (goal) {
+        case 'strength':
+            return length === 'short'
+                ? 'strength_short'
+                : length === 'default'
+                    ? 'strength_default'
+                    : 'strength_long';
+        case 'build_muscle':
+            return length === 'short'
+                ? 'build_muscle_short'
+                : length === 'default'
+                    ? 'build_muscle_default'
+                    : 'build_muscle_long';
+        case 'fat_loss':
+            return length === 'short'
+                ? 'fat_loss_short'
+                : length === 'default'
+                    ? 'fat_loss_default'
+                    : 'fat_loss_long';
+        default:
+            return 'strength_default';
+    }
+};
+exports.getRestTimerLength = getRestTimerLength;
 /**
  * Normalizes the exercise category to a HevyTrainerExerciseCategory
  * - Treat custom exercises and exercises with no category as `compound`
@@ -498,7 +534,7 @@ exports.pickExerciseForPrescription = pickExerciseForPrescription;
  */
 const generateProgram = (params) => {
     var _a;
-    const { trainerAlgorithmSettings, selectedDays, selectedGoal, selectedLevel, selectedEquipments, selectedWorkoutDurationMinutes, exerciseStore, focusMuscle, excludedExerciseIds, } = params;
+    const { trainerAlgorithmSettings, selectedDays, selectedGoal, selectedLevel, selectedEquipments, selectedWorkoutDurationMinutes, selectedRestTimerLength, exerciseStore, focusMuscle, excludedExerciseIds, } = params;
     const routines = exports.programSplits[selectedDays];
     const program = {
         name: selectedDays,
@@ -565,7 +601,7 @@ const generateProgram = (params) => {
                     sets: (0, exports.getTrainerSetCount)(trainerAlgorithmSettings, selectedGoal, selectedDays),
                     repRangeStart: repRange.rep_range_start,
                     repRangeEnd: repRange.rep_range_end,
-                    restTimerSeconds: (0, exports.getTrainerRestTimerSeconds)(trainerAlgorithmSettings, selectedGoal, exercisePrescription.category),
+                    restTimerSeconds: (0, exports.getTrainerRestTimerSeconds)(trainerAlgorithmSettings, (0, exports.getRestTimerLength)(selectedGoal, selectedRestTimerLength), exercisePrescription.category),
                     warmupSetCount: exercisePrescription.warmup_set_count,
                     notes: (_a = trainerAlgorithmSettings.exercise_notes[exercise.id]) !== null && _a !== void 0 ? _a : '',
                 });

package/built/index.d.ts

@@ -640,9 +640,11 @@ export declare const isCustomExerciseType: (x: any) => x is CustomExerciseType;
 export declare const trainingGoals: readonly ["strength", "build_muscle", "fat_loss"];
 export declare const trainingLevels: readonly ["beginner", "intermediate", "advanced"];
 export declare const exerciseCategories: readonly ["isolation", "compound", "assistance-compound"];
+export declare const restTimerLengths: readonly ["short", "default", "long"];
 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 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/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.weeklyTrainingFrequencies = exports.isGranularEquipment = exports.granularEquipments = exports.hevyTrainerProgramEquipments = exports.exerciseCategories = exports.trainingLevels = exports.trainingGoals = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.parseClientAuthTokenResponse = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = void 0;
-exports.isOAuthScope = exports.supportedScopes = exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = void 0;
+exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.weeklyTrainingFrequencies = exports.isGranularEquipment = exports.granularEquipments = exports.hevyTrainerProgramEquipments = exports.restTimerLengths = exports.exerciseCategories = exports.trainingLevels = exports.trainingGoals = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.parseClientAuthTokenResponse = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = void 0;
+exports.isOAuthScope = exports.supportedScopes = exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = exports.isHeartRateSamples = void 0;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
@@ -227,6 +227,7 @@ exports.exerciseCategories = [
     'compound',
     'assistance-compound',
 ];
+exports.restTimerLengths = ['short', 'default', 'long'];
 exports.hevyTrainerProgramEquipments = [
     'barbell',
     'dumbbell',

package/package.json

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