hevy-shared 1.0.942 → 1.0.944

package/built/API/APIClient.d.ts

@@ -1,5 +1,5 @@
 import { ClientAuthToken, DeepReadonly } from '..';
-import { RequestConfig, HTTPResponse, HTTPClient, HTTPResponseHandler, HTTPErrorHandler } from './types';
+import { RequestConfig, HTTPResponse, HTTPClient, HTTPRequestCompletionCallback, HTTPErrorHandler } from './types';
 interface HevyAPIClientConfig<UserContext> {
     /**
      * How long before predicted token expiry to request a new token. We request
@@ -90,7 +90,7 @@ export declare class HevyAPIClient<UserContext = never> {
     private static readonly DEFAULT_TOKEN_REFRESH_THROTTLE_MS;
     private static readonly DEFAULT_REFRESH_AUTH_TOKEN_API_ENDPOINT;
     private readonly _config;
-    private _responseHandlers;
+    private _requestCompletionCallbacks;
     private _errorHandlers;
     private _authTokenFactory;
     private _legacyAuthToken;
@@ -133,12 +133,12 @@ export declare class HevyAPIClient<UserContext = never> {
      * This is a lower level API than {@link attachErrorHandler} - prefer using
      * that one instead of this one if it's enough to suit your needs.
      */
-    attachResponseHandler(onResponse: HTTPResponseHandler): void;
-    removeResponseHandlers(): void;
+    attachRequestCompletionCallback(onResult: HTTPRequestCompletionCallback): void;
+    removeRequestCompletionCallbacks(): void;
     /**
      * Adds a callback to be executed on receiving an HTTP error from the server.
      * This callback will not be executed for any other type of error, such as a
-     * network error. For that and more, use {@link attachResponseHandler}.
+     * network error. For that and more, use {@link attachRequestCompletionCallback}.
      */
     attachErrorHandler(onError: HTTPErrorHandler<{
         willRetry: boolean;

package/built/API/APIClient.js

@@ -20,7 +20,7 @@ const __1 = require("..");
 const types_1 = require("./types");
 class HevyAPIClient {
     constructor(httpClient, config) {
-        this._responseHandlers = [];
+        this._requestCompletionCallbacks = [];
         this._errorHandlers = [];
         this._authTokenFactory = {
             type: 'value',
@@ -146,11 +146,11 @@ class HevyAPIClient {
                         response,
                     });
                 }
-                this._responseHandlers.forEach((cb) => cb({ isSuccess: true, value: response }, request));
+                this._requestCompletionCallbacks.forEach((cb) => cb({ isSuccess: true, value: response }, request));
                 return response;
             }
             catch (e) {
-                this._responseHandlers.forEach((cb) => cb({ isSuccess: false, error: e }, request));
+                this._requestCompletionCallbacks.forEach((cb) => cb({ isSuccess: false, error: e }, request));
                 if (!(0, types_1.isHTTPError)(e))
                     throw e;
                 const { response } = e;
@@ -250,16 +250,16 @@ class HevyAPIClient {
      * This is a lower level API than {@link attachErrorHandler} - prefer using
      * that one instead of this one if it's enough to suit your needs.
      */
-    attachResponseHandler(onResponse) {
-        this._responseHandlers.push(onResponse);
+    attachRequestCompletionCallback(onResult) {
+        this._requestCompletionCallbacks.push(onResult);
     }
-    removeResponseHandlers() {
-        this._responseHandlers.length = 0;
+    removeRequestCompletionCallbacks() {
+        this._requestCompletionCallbacks.length = 0;
     }
     /**
      * Adds a callback to be executed on receiving an HTTP error from the server.
      * This callback will not be executed for any other type of error, such as a
-     * network error. For that and more, use {@link attachResponseHandler}.
+     * network error. For that and more, use {@link attachRequestCompletionCallback}.
      */
     attachErrorHandler(onError) {
         this._errorHandlers.push(onError);

package/built/API/types.d.ts

@@ -23,7 +23,7 @@ export interface HTTPRequestFactory<T = unknown> {
     headers: Record<string, string>;
     try(): Promise<HTTPResponse<T>>;
 }
-export type HTTPResponseHandler<T = unknown, R = unknown> = (response: Result<HTTPResponse<T>>, request: HTTPRequestFactory<R>) => void;
+export type HTTPRequestCompletionCallback<T = unknown, R = unknown> = (result: Result<HTTPResponse<T>>, request: HTTPRequestFactory<R>) => void;
 export type HTTPErrorHandler<E, T = unknown, R = unknown> = (response: HTTPResponse<T>, request: HTTPRequestFactory<R>, extraData: E) => void;
 export interface HTTPResponse<T = unknown> {
     status: number;

package/built/hevyTrainer.d.ts

@@ -1,4 +1,4 @@
-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];
@@ -45,6 +45,7 @@ export interface ProgramGenerationParams<T extends HevyTrainerLibraryExercise> {
     selectedLevel: TrainingLevel;
     selectedEquipments: GranularEquipment[];
     selectedWorkoutDurationMinutes?: WorkoutDurationMinutes;
+    selectedRestTimerLength: RestTimerLength;
     exerciseStore: T[];
     focusMuscle?: SimplifiedMuscleGroup;
     excludedExerciseIds?: Set<string>;
@@ -71,8 +72,11 @@ export type RepRanges = {
 export type RestTimersPerCategory = {
     [key in HevyTrainerExerciseCategory]: number;
 };
+export type CategoryPerRestTimerLength = {
+    [key in RestTimerLength]: RestTimersPerCategory;
+};
 export type RestTimers = {
-    [key in TrainingGoal]: RestTimersPerCategory;
+    [key in TrainingGoal]: CategoryPerRestTimerLength;
 };
 export type ExercisePriorities = {
     [key in MuscleGroup]: exerciseId[];
@@ -135,7 +139,7 @@ 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, goal: TrainingGoal, length: RestTimerLength, exerciseCategory: HevyTrainerExerciseCategory) => number;
 /**
  * Normalizes the exercise category to a HevyTrainerExerciseCategory
  * - Treat custom exercises and exercises with no category as `compound`

package/built/hevyTrainer.js

@@ -203,8 +203,8 @@ 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, goal, length, exerciseCategory) => {
+    return trainerAlgorithmSettings.rest_timers[goal][length][exerciseCategory];
 };
 exports.getTrainerRestTimerSeconds = getTrainerRestTimerSeconds;
 /**
@@ -498,7 +498,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 +565,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, 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", "medium", "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"];
@@ -1259,6 +1261,7 @@ export interface HevyTrainerProgram {
     focus_muscle?: SimplifiedMuscleGroup;
     next_workout_index: number;
     workout_duration_minutes?: WorkoutDurationMinutes;
+    rest_timer_length: RestTimerLength;
 }
 export interface PostHevyTrainerProgramRequestBody {
     program: {
@@ -1271,6 +1274,7 @@ export interface PostHevyTrainerProgramRequestBody {
         routines: RoutineUpdate[];
         next_workout_index?: number;
         workout_duration_minutes?: WorkoutDurationMinutes;
+        rest_timer_length: RestTimerLength;
     };
 }
 export interface UpdateHevyTrainerProgramRequestBody {
@@ -1284,6 +1288,7 @@ export interface UpdateHevyTrainerProgramRequestBody {
         focus_muscle?: SimplifiedMuscleGroup;
         next_workout_index?: number;
         workout_duration_minutes?: WorkoutDurationMinutes;
+        rest_timer_length?: RestTimerLength;
         routines: {
             id: string;
             title: string;

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', 'medium', 'long'];
 exports.hevyTrainerProgramEquipments = [
     'barbell',
     'dumbbell',

package/package.json

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