hevy-shared 1.0.944 → 1.0.946

package/built/API/APIClient.js

@@ -49,9 +49,9 @@ class HevyAPIClient {
         }
     }
     get _authHeaders() {
-        return Object.assign(Object.assign({}, (this._authToken
+        return Object.assign(Object.assign(Object.assign({}, (this._authToken
             ? { authorization: `Bearer ${this._authToken.access_token}` }
-            : {})), (this._legacyAuthToken ? { 'auth-token': this._legacyAuthToken } : {}));
+            : {})), (this._legacyAuthToken ? { 'auth-token': this._legacyAuthToken } : {})), { 'x-client-time': String(new Date().valueOf() / 1000) });
     }
     refreshExpiredAuthToken(userContext) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -99,7 +99,10 @@ class HevyAPIClient {
             this._lastTokenRefresh = new Date();
             const { access_token, refresh_token } = authToken;
             const { method, url } = this.refreshAuthTokenApiEndpoint;
-            const headers = { authorization: `Bearer ${access_token}` };
+            const headers = {
+                authorization: `Bearer ${access_token}`,
+                'x-client-time': String(new Date().valueOf() / 1000),
+            };
             // This will throw and bail out if the request fails.
             const response = yield this._handleResponse({
                 method,

package/built/filterExercises.d.ts

@@ -1,4 +1,5 @@
-import { EquipmentFilter, Language, LibraryExercise, MuscleGroupFilter, CustomExercise } from './index';
+import { EquipmentFilter, LibraryExercise, MuscleGroupFilter, CustomExercise } from './index';
+import { Language } from './translations';
 export interface SearchableLibraryExercise extends LibraryExercise {
     localized_muscle_group_name: string;
 }

package/built/hevyTrainer.d.ts

@@ -1,4 +1,4 @@
-import { WeeklyTrainingFrequency, TrainingGoal, TrainingLevel, SimplifiedMuscleGroup, MuscleGroup, LibraryExercise, ExerciseCategory, GranularEquipment, HevyTrainerProgramEquipment, RestTimerLength } from '.';
+import { WeeklyTrainingFrequency, TrainingGoal, TrainingLevel, SimplifiedMuscleGroup, MuscleGroup, LibraryExercise, ExerciseCategory, GranularEquipment, HevyTrainerProgramEquipment } from '.';
 export type HevyTrainerExerciseCategory = typeof hevyTrainerExerciseCategories[number];
 export type HevyTrainerRoutineName = typeof routineNames[number];
 export declare const workoutDurationOptions: readonly [40, 60, 80];
@@ -45,7 +45,6 @@ export interface ProgramGenerationParams<T extends HevyTrainerLibraryExercise> {
     selectedLevel: TrainingLevel;
     selectedEquipments: GranularEquipment[];
     selectedWorkoutDurationMinutes?: WorkoutDurationMinutes;
-    selectedRestTimerLength: RestTimerLength;
     exerciseStore: T[];
     focusMuscle?: SimplifiedMuscleGroup;
     excludedExerciseIds?: Set<string>;
@@ -72,11 +71,8 @@ export type RepRanges = {
 export type RestTimersPerCategory = {
     [key in HevyTrainerExerciseCategory]: number;
 };
-export type CategoryPerRestTimerLength = {
-    [key in RestTimerLength]: RestTimersPerCategory;
-};
 export type RestTimers = {
-    [key in TrainingGoal]: CategoryPerRestTimerLength;
+    [key in TrainingGoal]: RestTimersPerCategory;
 };
 export type ExercisePriorities = {
     [key in MuscleGroup]: exerciseId[];
@@ -139,7 +135,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, length: RestTimerLength, exerciseCategory: HevyTrainerExerciseCategory) => number;
+export declare const getTrainerRestTimerSeconds: (trainerAlgorithmSettings: TrainerAlgorithmSettings, goal: TrainingGoal, 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, length, exerciseCategory) => {
-    return trainerAlgorithmSettings.rest_timers[goal][length][exerciseCategory];
+const getTrainerRestTimerSeconds = (trainerAlgorithmSettings, goal, exerciseCategory) => {
+    return trainerAlgorithmSettings.rest_timers[goal][exerciseCategory];
 };
 exports.getTrainerRestTimerSeconds = getTrainerRestTimerSeconds;
 /**
@@ -498,7 +498,7 @@ exports.pickExerciseForPrescription = pickExerciseForPrescription;
  */
 const generateProgram = (params) => {
     var _a;
-    const { trainerAlgorithmSettings, selectedDays, selectedGoal, selectedLevel, selectedEquipments, selectedWorkoutDurationMinutes, selectedRestTimerLength, exerciseStore, focusMuscle, excludedExerciseIds, } = params;
+    const { trainerAlgorithmSettings, selectedDays, selectedGoal, selectedLevel, selectedEquipments, selectedWorkoutDurationMinutes, 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, selectedRestTimerLength, exercisePrescription.category),
+                    restTimerSeconds: (0, exports.getTrainerRestTimerSeconds)(trainerAlgorithmSettings, selectedGoal, exercisePrescription.category),
                     warmupSetCount: exercisePrescription.warmup_set_count,
                     notes: (_a = trainerAlgorithmSettings.exercise_notes[exercise.id]) !== null && _a !== void 0 ? _a : '',
                 });

package/built/index.d.ts

@@ -1,5 +1,5 @@
 import { WorkoutDurationMinutes } from './hevyTrainer';
-import { Language } from './translationUtils';
+import { Language } from './translations';
 import { Lookup } from './typeUtils';
 export * from './constants';
 export * from './utils';
@@ -21,7 +21,7 @@ export * from './async';
 export * from './adminPermissions';
 export * from './adjustEventTokens';
 export * from './hevyTrainer';
-export * from './translationUtils';
+export * from './translations';
 export type WeightUnit = 'kg' | 'lbs';
 export declare const isWeightUnit: (x: string) => x is WeightUnit;
 export type DistanceUnit = 'kilometers' | 'miles';
@@ -640,11 +640,9 @@ 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"];
@@ -1261,7 +1259,6 @@ export interface HevyTrainerProgram {
     focus_muscle?: SimplifiedMuscleGroup;
     next_workout_index: number;
     workout_duration_minutes?: WorkoutDurationMinutes;
-    rest_timer_length: RestTimerLength;
 }
 export interface PostHevyTrainerProgramRequestBody {
     program: {
@@ -1274,7 +1271,6 @@ export interface PostHevyTrainerProgramRequestBody {
         routines: RoutineUpdate[];
         next_workout_index?: number;
         workout_duration_minutes?: WorkoutDurationMinutes;
-        rest_timer_length: RestTimerLength;
     };
 }
 export interface UpdateHevyTrainerProgramRequestBody {
@@ -1288,7 +1284,6 @@ 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.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;
+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;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
@@ -37,7 +37,7 @@ __exportStar(require("./async"), exports);
 __exportStar(require("./adminPermissions"), exports);
 __exportStar(require("./adjustEventTokens"), exports);
 __exportStar(require("./hevyTrainer"), exports);
-__exportStar(require("./translationUtils"), exports);
+__exportStar(require("./translations"), exports);
 const isWeightUnit = (x) => {
     return x === 'kg' || x === 'lbs';
 };
@@ -227,7 +227,6 @@ exports.exerciseCategories = [
     'compound',
     'assistance-compound',
 ];
-exports.restTimerLengths = ['short', 'medium', 'long'];
 exports.hevyTrainerProgramEquipments = [
     'barbell',
     'dumbbell',

package/built/translations/index.d.ts

@@ -0,0 +1,2 @@
+export * from './translationUtils';
+export * from './types';

package/built/translations/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./translationUtils"), exports);
+__exportStar(require("./types"), exports);

package/built/translations/translationUtils.d.ts

@@ -0,0 +1,2 @@
+import { PositionalTextParams, NamedTextParams, PositionalReactParams, NamedReactParams } from './types';
+export declare function interpolate<T extends string>(str: string, params: PositionalTextParams | NamedTextParams<T> | PositionalReactParams | NamedReactParams<T>): string | (string | number)[];

package/built/translations/translationUtils.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.interpolate = interpolate;
+const hasReact = (params) => Object.values(params).some((v) => v !== null &&
+    v !== undefined &&
+    typeof v !== 'string' &&
+    typeof v !== 'number' &&
+    typeof v !== 'boolean');
+function interpolate(str, params) {
+    if (Array.isArray(params)) {
+        const positionalParams = params;
+        const hasReactParams = hasReact(positionalParams);
+        const re = () => /(%s)/g;
+        let i = 0;
+        if (hasReactParams) {
+            return str
+                .split(/(%s)/g)
+                .filter((w) => !!w)
+                .map((w) => {
+                var _a, _b;
+                const [, key] = (_a = re().exec(w)) !== null && _a !== void 0 ? _a : [];
+                if (!key) {
+                    return w;
+                }
+                else {
+                    return ((_b = positionalParams[i++]) !== null && _b !== void 0 ? _b : (console.error(`Missing param ${i} in the string "${str}"`), w));
+                }
+            });
+        }
+        else {
+            return str.replace(re(), (_) => { var _a; return String((_a = positionalParams[i++]) !== null && _a !== void 0 ? _a : _); });
+        }
+    }
+    else {
+        const namedParams = params;
+        const hasReactParams = hasReact(namedParams);
+        const re = () => /%{([^}]*)}/g;
+        if (hasReactParams) {
+            return str
+                .split(/(%{[^}]*})/g)
+                .filter((w) => !!w)
+                .map((w) => {
+                var _a, _b;
+                const [, key] = (_a = re().exec(w)) !== null && _a !== void 0 ? _a : [];
+                if (!key) {
+                    if (key === '') {
+                        console.error(`Empty param in the string "${str}"`);
+                    }
+                    return w;
+                }
+                else {
+                    return ((_b = namedParams[key]) !== null && _b !== void 0 ? _b : (console.error(`Missing param "${key}" in the string "${str}"`),
+                        w));
+                }
+            });
+        }
+        else {
+            return str.replace(re(), (_, key) => { var _a; return String((_a = namedParams[key]) !== null && _a !== void 0 ? _a : _); });
+        }
+    }
+}

package/built/translations/types.d.ts

@@ -0,0 +1,8 @@
+import { Lookup } from '../typeUtils';
+export declare const supportedLanguages: readonly ["en", "es", "de", "fr", "it", "pt", "tr", "zh_CN", "zh_TW", "ru", "ja", "ko"];
+export type Language = Lookup<typeof supportedLanguages>;
+export declare const isLanguage: (x: string) => x is Language;
+export type PositionalTextParams = (string | number)[];
+export type NamedTextParams<T extends string> = Record<T, string | number>;
+export type PositionalReactParams = (string | number | object)[];
+export type NamedReactParams<T extends string> = Record<T, string | number | object>;

package/built/translations/types.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLanguage = exports.supportedLanguages = void 0;
+const typeUtils_1 = require("../typeUtils");
+exports.supportedLanguages = [
+    'en',
+    'es',
+    'de',
+    'fr',
+    'it',
+    'pt',
+    'tr',
+    'zh_CN',
+    'zh_TW',
+    'ru',
+    'ja',
+    'ko',
+];
+const isLanguage = (x) => (0, typeUtils_1.isInArray)(x, exports.supportedLanguages);
+exports.isLanguage = isLanguage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.944",
+  "version": "1.0.946",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
@@ -17,12 +17,16 @@
   },
   "exports": {
     ".": "./built/index.js",
-    "./API": "./built/API/index.js"
+    "./API": "./built/API/index.js",
+    "./translations": "./built/translations/index.js"
   },
   "typesVersions": {
     "*": {
       "API": [
         "built/API/index.d.ts"
+      ],
+      "translations": [
+        "built/translations/index.d.ts"
       ]
     }
   },

package/built/translationUtils.d.ts

@@ -1,5 +0,0 @@
-import { Lookup } from './typeUtils';
-export declare const supportedLanguages: readonly ["en", "es", "de", "fr", "it", "pt", "tr", "zh_CN", "zh_TW", "ru", "ja", "ko"];
-export type Language = Lookup<typeof supportedLanguages>;
-export declare const isLanguage: (x: string) => x is Language;
-export declare const interpolate: (str: string, params: any[]) => string;

package/built/translationUtils.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.interpolate = exports.isLanguage = exports.supportedLanguages = void 0;
-const typeUtils_1 = require("./typeUtils");
-exports.supportedLanguages = [
-    'en',
-    'es',
-    'de',
-    'fr',
-    'it',
-    'pt',
-    'tr',
-    'zh_CN',
-    'zh_TW',
-    'ru',
-    'ja',
-    'ko',
-];
-const isLanguage = (x) => (0, typeUtils_1.isInArray)(x, exports.supportedLanguages);
-exports.isLanguage = isLanguage;
-const interpolate = (str, params) => {
-    let i = 0;
-    return str
-        .replace(/%s/g, () => {
-        i += 1;
-        return params[i - 1];
-    })
-        .replace(/%{([\w-]*)}/g, (__, key) => params[0][key]);
-};
-exports.interpolate = interpolate;