hevy-shared 1.0.971 → 1.0.973

package/built/hevyTrainer.d.ts

@@ -1,6 +1,6 @@
-import { WeeklyTrainingFrequency, TrainingGoal, TrainingLevel, SimplifiedMuscleGroup, MuscleGroup, LibraryExercise, ExerciseCategory, GranularEquipment, HevyTrainerProgramEquipment, RestTimerLength } from '.';
+import { WeeklyTrainingFrequency, TrainingGoal, TrainingLevel, SimplifiedMuscleGroup, MuscleGroup, LibraryExercise, ExerciseCategory, GranularEquipment, HevyTrainerProgramEquipment, RestTimerLength, CardioPreference } from '.';
 export type HevyTrainerExerciseCategory = typeof hevyTrainerExerciseCategories[number];
-export type TrainerWorkoutTemplateName = typeof workoutTemplateNames[number];
+export type HevyTrainerRoutineName = typeof routineNames[number];
 export declare const workoutDurationOptions: readonly [40, 60, 80];
 export type WorkoutDurationMinutes = typeof workoutDurationOptions[number];
 export declare const trainerGymTypes: readonly ["home_gym", "garage_gym", "commercial_gym", "full_gym"];
@@ -16,14 +16,14 @@ export declare const trainerEquipmentToGranularEquipments: (equipments: HevyTrai
 export declare const granularEquipmentsToTrainerEquipments: (granularEquipments: GranularEquipment[]) => HevyTrainerProgramEquipment[];
 export declare const hevyTrainerExerciseCategories: readonly ["compound", "isolation"];
 export declare const defaultDurationPerFrequency: Record<WeeklyTrainingFrequency, WorkoutDurationMinutes>;
-export declare const workoutTemplateNames: 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 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 | 'all';
     equipments: GranularEquipment[];
     routineBarbellExerciseCount: number;
     level: TrainingLevel;
-    goal: TrainingGoal;
+    goal: TrainingGoal | 'all';
     muscleGroup: MuscleGroup;
     frequency: WeeklyTrainingFrequency;
 }
@@ -59,6 +59,7 @@ export interface ProgramGenerationParams<T extends HevyTrainerLibraryExercise> {
     exerciseStore: T[];
     focusMuscle?: SimplifiedMuscleGroup;
     excludedExerciseIds?: Set<string>;
+    cardio: CardioPreference;
     /**
      * When enabled, includes exercise selection trace breadcrumbs in the result
      * for debugging. Intended for troubleshooting on backoffice; keep off in
@@ -67,7 +68,7 @@ export interface ProgramGenerationParams<T extends HevyTrainerLibraryExercise> {
     debugExerciseSelectionTrace?: boolean;
 }
 export interface ProgramExerciseSelectionTraceRecord {
-    routine: TrainerWorkoutTemplateName;
+    routine: HevyTrainerRoutineName;
     prescriptionIndex: number;
     prescription: ExercisePrescription;
     resolvedMuscleGroup: MuscleGroup;
@@ -80,7 +81,7 @@ export type TrainerProgramAttemptWithTraces = TrainerProgramAttempt & {
 };
 export type FrequencyString = 'one_day' | 'two_days' | 'three_days' | 'four_days' | 'five_days' | 'six_days';
 export declare const frequencyMap: Record<WeeklyTrainingFrequency, FrequencyString>;
-export declare const programSplits: Record<WeeklyTrainingFrequency, TrainerWorkoutTemplateName[]>;
+export declare const programSplits: Record<WeeklyTrainingFrequency, HevyTrainerRoutineName[]>;
 export type SetsPerGoal = {
     [key in TrainingGoal]: number;
 };
@@ -126,7 +127,7 @@ export interface WorkoutTemplate {
     notes?: string;
 }
 export type Templates = {
-    [key in TrainerWorkoutTemplateName]: WorkoutTemplate;
+    [key in HevyTrainerRoutineName]: WorkoutTemplate;
 };
 export interface BackofficeTrainerPreset {
     id?: number;
@@ -157,7 +158,7 @@ export interface TrainerProgramExercise {
     notes?: string;
 }
 export interface TrainerProgramRoutine {
-    name: TrainerWorkoutTemplateName;
+    name: HevyTrainerRoutineName;
     exercises: TrainerProgramExercise[];
     notes?: string;
 }

package/built/hevyTrainer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrioritySortedExercises = exports.isEquipmentCompatible = exports.normalizeExerciseCategory = exports.getTrainerRestTimerSeconds = exports.getTrainerRepRange = exports.getTrainerSetCount = exports.programSplits = exports.frequencyMap = exports.workoutTemplateNames = exports.defaultDurationPerFrequency = exports.hevyTrainerExerciseCategories = exports.granularEquipmentsToTrainerEquipments = exports.trainerEquipmentToGranularEquipments = exports.granularEquipmentDefaults = exports.trainerGymTypes = exports.workoutDurationOptions = void 0;
+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.pickExerciseForPrescription = pickExerciseForPrescription;
 exports.generateProgram = generateProgram;
 const _1 = require(".");
@@ -152,7 +152,7 @@ exports.defaultDurationPerFrequency = {
     5: 40,
     6: 40,
 };
-exports.workoutTemplateNames = [
+exports.routineNames = [
     // Full body 1x
     'full_body_1',
     // Full body 2x
@@ -414,7 +414,7 @@ const isExerciseMatch = (exercise, criteria) => {
         (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;
-    const goalMatch = (_d = (_c = exercise.goal) === null || _c === void 0 ? void 0 : _c.includes(criteria.goal)) !== null && _d !== void 0 ? _d : false;
+    const goalMatch = (_d = (criteria.goal === 'all' || ((_c = exercise.goal) === null || _c === void 0 ? void 0 : _c.includes(criteria.goal)))) !== null && _d !== void 0 ? _d : false;
     const equipmentMatch = (0, exports.isEquipmentCompatible)(exercise, criteria.equipments);
     const barbellLimitOk = isBarbellExerciseAllowed(exercise, criteria.routineBarbellExerciseCount, criteria.equipments, criteria.frequency);
     return (categoryMatch && levelMatch && goalMatch && equipmentMatch && barbellLimitOk);
@@ -433,7 +433,8 @@ const isAlternativeIsolationExerciseMatch = (exercise, criteria) => {
 /**
  * Finds an exercise that matches the criteria and is not already used
  */
-const findMatchingExercise = (exercises, criteria, context) => {
+const findMatchingExercise = (exercises, //TODO: muscle group exercises
+criteria, context) => {
     return exercises.find((exercise) => {
         const matchesCriteria = isExerciseMatch(exercise, criteria);
         const isNotUsed = !isExerciseUsed(exercise, context);
@@ -537,13 +538,14 @@ function pickExerciseForPrescription(params) {
 }
 function generateProgram(params) {
     var _a, _b;
-    const { trainerAlgorithmSettings, frequency, goal, level, equipments, workoutDurationMinutes, restTimerLength, exerciseStore, focusMuscle, excludedExerciseIds, debugExerciseSelectionTrace, } = params;
+    const { trainerAlgorithmSettings, frequency, goal, level, equipments, workoutDurationMinutes, restTimerLength, exerciseStore, focusMuscle, excludedExerciseIds, debugExerciseSelectionTrace, cardio, } = params;
     const exerciseSelectionTraces = [];
     const routines = exports.programSplits[frequency];
     const program = {
         name: frequency,
         routines: [],
     };
+    // TODO: Rename sortedExercises to sortedExercisesByMuscleGroup or something similar
     const sortedExercises = (0, exports.getPrioritySortedExercises)(trainerAlgorithmSettings.exercise_priorities, exerciseStore);
     const programUsedExerciseIds = new Set();
     let programFocusMuscleExerciseCount = 0;
@@ -651,6 +653,90 @@ function generateProgram(params) {
                 });
             }
         }
+        if (cardio) {
+            const cardioExercises = sortedExercises['cardio'];
+            const cardioExercise = findMatchingExercise(cardioExercises, {
+                frequency,
+                exerciseCategory: 'all',
+                equipments,
+                muscleGroup: 'cardio',
+                routineBarbellExerciseCount,
+                level,
+                goal: 'all',
+            }, {
+                programUsedExerciseIds,
+                routineUsedExerciseIds,
+                excludedExerciseIds,
+            });
+            // TODO change the interface to include cardio
+            if (cardioExercise) {
+                if (cardio === 'beginning') {
+                    routineExercises.unshift({
+                        exerciseTemplate: cardioExercise,
+                        muscleGroup: 'cardio',
+                        category: 'compound',
+                        sets: 1,
+                        repRangeStart: 0,
+                        repRangeEnd: 0,
+                        restTimerSeconds: 0,
+                    });
+                    exerciseSelectionTraces.unshift({
+                        routine,
+                        prescriptionIndex: 0,
+                        prescription: { muscle_group: 'cardio', category: 'compound' },
+                        resolvedMuscleGroup: 'cardio',
+                        criteria: {
+                            frequency,
+                            exerciseCategory: 'all',
+                            equipments,
+                            muscleGroup: 'cardio',
+                            routineBarbellExerciseCount,
+                            level,
+                            goal: 'all',
+                        },
+                        selectedExerciseId: cardioExercise.id,
+                        trace: {
+                            entries: [],
+                            selectedPass: 1,
+                        },
+                    });
+                }
+                else {
+                    routineExercises.push({
+                        exerciseTemplate: cardioExercise,
+                        muscleGroup: 'cardio',
+                        category: 'compound',
+                        sets: 1,
+                        repRangeStart: 0,
+                        repRangeEnd: 0,
+                        restTimerSeconds: 0,
+                    });
+                    // todo: handle debug traces with the exercises
+                    exerciseSelectionTraces.push({
+                        routine,
+                        prescriptionIndex: routineExercises.length,
+                        prescription: { muscle_group: 'cardio', category: 'compound' },
+                        resolvedMuscleGroup: 'cardio',
+                        criteria: {
+                            frequency,
+                            exerciseCategory: 'all',
+                            equipments,
+                            muscleGroup: 'cardio',
+                            routineBarbellExerciseCount,
+                            level,
+                            goal: 'all',
+                        },
+                        selectedExerciseId: cardioExercise.id,
+                        trace: {
+                            entries: [],
+                            selectedPass: 1,
+                        },
+                    });
+                }
+                programUsedExerciseIds.add(cardioExercise.id);
+                routineUsedExerciseIds.add(cardioExercise.id);
+            }
+        }
         program.routines.push({
             name: routine,
             notes: routineTemplate.notes,

package/built/index.d.ts

@@ -1,7 +1,10 @@
 import { InstructionsLanguage } from './exerciseLocaleUtils';
-import { TrainerWorkoutTemplateName, WorkoutDurationMinutes } from './hevyTrainer';
+import { WorkoutDurationMinutes } from './hevyTrainer';
+import { postEmailBackofficeSchema } from './schemas';
 import { Language } from './translations';
 import { Lookup } from './typeUtils';
+import { z } from 'zod';
+export * from './schemas';
 export * from './constants';
 export * from './utils';
 export * from './units';
@@ -647,6 +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 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"];
@@ -881,7 +885,6 @@ export interface Workout {
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
     trainer_program_id: string | undefined;
-    trainer_workout_template_id: string | undefined;
 }
 export interface CustomExerciseImage {
     type: 'image';
@@ -961,7 +964,6 @@ export interface PostWorkoutRequestWorkout {
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
     trainer_program_id: string | undefined;
-    trainer_workout_template_id: string | undefined;
 }
 export declare const isHeartRateSamples: (x: any) => x is HeartRateSample[];
 export declare const isWorkoutBiometrics: (x: any) => x is WorkoutBiometrics;
@@ -1250,88 +1252,6 @@ export interface GetTeamInviteResponse {
 export interface OutstandingInvitesForCoachTeamResponse {
     invites: CoachTeamInvite[];
 }
-export interface TrainerWorkoutTemplateExercise {
-    id: string;
-    exercise_template_id: string;
-    index: number;
-    set_count: number;
-    warmup_set_count: number;
-    rep_range?: RepRange;
-    rest_seconds: number;
-}
-export interface TrainerWorkoutTemplate {
-    id: string;
-    hevy_trainer_program_id: string;
-    index: number;
-    name: TrainerWorkoutTemplateName;
-    exercises: TrainerWorkoutTemplateExercise[];
-}
-export interface TrainerProgramV3 {
-    id: string;
-    schema_version: 'v3';
-    created_at: string;
-    updated_at: string;
-    level: TrainingLevel;
-    goal: TrainingGoal;
-    equipments: GranularEquipment[];
-    weekly_frequency: WeeklyTrainingFrequency;
-    templates: TrainerWorkoutTemplate[];
-    focus_muscle?: SimplifiedMuscleGroup;
-    next_workout_index: number;
-    workout_duration_minutes: WorkoutDurationMinutes;
-    rest_timer_length: RestTimerLength;
-}
-export interface PostTrainerProgramV3RequestBody {
-    program: {
-        title: string;
-        level: TrainingLevel;
-        goal: TrainingGoal;
-        equipments: GranularEquipment[];
-        weekly_frequency: WeeklyTrainingFrequency;
-        focus_muscle?: SimplifiedMuscleGroup;
-        next_workout_index?: number;
-        workout_duration_minutes: WorkoutDurationMinutes;
-        rest_timer_length: RestTimerLength;
-        templates: {
-            index: number;
-            name: TrainerWorkoutTemplateName;
-            exercises: {
-                exercise_template_id: string;
-                index: number;
-                set_count: number;
-                warmup_set_count: number;
-                rep_range?: RepRange;
-                rest_seconds: number;
-            }[];
-        }[];
-    };
-}
-export interface UpdateTrainerProgramV3RequestBody {
-    program: {
-        programId: string;
-        level: TrainingLevel;
-        goal: TrainingGoal;
-        equipments: GranularEquipment[];
-        weekly_frequency: WeeklyTrainingFrequency;
-        focus_muscle?: SimplifiedMuscleGroup;
-        next_workout_index?: number;
-        workout_duration_minutes: WorkoutDurationMinutes;
-        rest_timer_length: RestTimerLength;
-        templates: {
-            id: string;
-            index: number;
-            name: TrainerWorkoutTemplateName;
-            exercises: {
-                exercise_template_id: string;
-                index: number;
-                set_count: number;
-                warmup_set_count: number;
-                rep_range?: RepRange;
-                rest_seconds: number;
-            }[];
-        }[];
-    };
-}
 export interface HevyTrainerProgram {
     id: string;
     created_at: string;
@@ -1346,6 +1266,7 @@ export interface HevyTrainerProgram {
     next_workout_index: number;
     workout_duration_minutes?: WorkoutDurationMinutes;
     rest_timer_length: RestTimerLength;
+    cardio_preference: CardioPreference;
 }
 export interface PostHevyTrainerProgramRequestBody {
     program: {
@@ -1359,6 +1280,7 @@ export interface PostHevyTrainerProgramRequestBody {
         next_workout_index?: number;
         workout_duration_minutes?: WorkoutDurationMinutes;
         rest_timer_length: RestTimerLength;
+        cardio_preference: CardioPreference;
     };
 }
 export interface UpdateHevyTrainerProgramRequestBody {
@@ -2071,6 +1993,7 @@ export interface GetAccountsByEmailResponse {
         wellhub_email: string | null;
     }[];
 }
+export type PostEmailBackofficeRequest = z.infer<typeof postEmailBackofficeSchema>;
 export interface UserReportSummaryBackoffice {
     reported_by: string;
     reported_at: string;

package/built/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = 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 = void 0;
 const typeUtils_1 = require("./typeUtils");
+__exportStar(require("./schemas"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./units"), exports);

package/built/normalizedWorkoutUtils.d.ts

@@ -36,7 +36,6 @@ export interface NormalizedWorkout {
     clientId: string;
     biometrics?: WorkoutBiometrics;
     trainerProgramId: string | undefined;
-    trainerWorkoutTemplateId?: string;
 }
 export interface NormalizedSet {
     index: number;

package/built/schemas.d.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+export declare const postEmailBackofficeSchema: z.ZodObject<{
+    toUserId: z.ZodString;
+    subject: z.ZodString;
+    message: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    message: string;
+    toUserId: string;
+    subject: string;
+}, {
+    message: string;
+    toUserId: string;
+    subject: string;
+}>;

package/built/schemas.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.postEmailBackofficeSchema = void 0;
+const zod_1 = require("zod");
+exports.postEmailBackofficeSchema = zod_1.z.object({
+    toUserId: zod_1.z.string(),
+    subject: zod_1.z.string(),
+    message: zod_1.z.string(),
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.971",
+  "version": "1.0.973",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "dayjs": "^1.11.19",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "zod": "3.24.3"
   }
 }

package/built/tests/hevyTrainer.test.d.ts

@@ -1 +0,0 @@
-export {};