hevy-shared 1.0.562 → 1.0.564

package/built/index.d.ts

@@ -465,9 +465,10 @@ export interface UserPreferences {
     live_pr_volume?: LivePRVolumeOption;
     inline_set_timer_enabled?: boolean;
     default_workout_visibility_public?: boolean;
-    default_workout_biometrics_visibility_public?: boolean;
+    /** Only updateable by the backend within a special API */
+    volume_includes_warmup_sets?: boolean;
 }
-export type UpdateUserPreferencesRequest = Omit<UserPreferences, 'username'>;
+export type UpdateUserPreferencesRequest = Omit<UserPreferences, 'username' | 'volume_includes_warmup_sets'>;
 export type FollowingStatus = 'not-following' | 'following' | 'requested';
 export type FollowingStatusMap = {
     [id: string]: Omit<FollowingStatus, 'not-following'>;
@@ -506,6 +507,10 @@ export interface RoutineMetadata {
     short_id: string;
     title: string;
 }
+export type PreviewMutualUser = {
+    username: string;
+    profile_pic: string | null;
+};
 export interface UserProfile {
     username: string;
     verified: boolean;
@@ -523,6 +528,7 @@ export interface UserProfile {
     following_count: number;
     routines: RoutineMetadata[];
     weekly_workout_durations: WeeklyWorkoutDuration[];
+    mutual_followers: PreviewMutualUser[];
 }
 export interface PublicUserProfile {
     private_profile: boolean;
@@ -774,13 +780,16 @@ export interface Workout {
      * why we added estimated_volume_kg
      */
     estimated_volume_kg: number;
+    /**
+     * Whether to include warmup sets in various calculations.
+     * https://github.com/hevyapp/hevy-shared/pull/312
+     */
+    include_warmup_sets: boolean;
     is_private: boolean;
     /**
      * If applicable, the user ID of the coach who logged this workout
      */
     logged_by_coach_id?: string;
-    biometrics?: WorkoutBiometrics;
-    is_biometrics_public: boolean;
 }
 export interface CustomExerciseImage {
     type: 'image';
@@ -857,18 +866,6 @@ export interface PostWorkoutRequestWorkout {
     wearos_watch: boolean;
     workout_id: string;
     is_private: boolean;
-    biometrics?: WorkoutBiometrics;
-    is_biometrics_public: boolean;
-}
-export declare const isHeartRateSamples: (x: any) => x is HeartRateSample[];
-export declare const isWorkoutBiometrics: (x: any) => x is WorkoutBiometrics;
-export interface WorkoutBiometrics {
-    total_calories?: number;
-    heart_rate_samples?: HeartRateSample[];
-}
-export interface HeartRateSample {
-    timestamp_ms: number;
-    bpm: number;
 }
 export interface PostWorkoutRequestExercise {
     title: string;
@@ -900,7 +897,7 @@ export interface PostWorkoutRequestSet {
  * update the corresponding values of the workout in the database, and those
  * that are undefined will not be changed.
  */
-export type UpdateWorkoutRequestWorkout = Partial<Pick<PostWorkoutRequestWorkout, 'title' | 'description' | 'media' | 'exercises' | 'is_private' | 'is_biometrics_public'>> & {
+export type UpdateWorkoutRequestWorkout = Partial<Pick<PostWorkoutRequestWorkout, 'title' | 'description' | 'media' | 'exercises' | 'is_private'>> & {
     start_and_end_time?: Required<Pick<PostWorkoutRequestWorkout, 'start_time' | 'end_time'>>;
 };
 /** Routines */
@@ -1334,6 +1331,18 @@ export interface WarmupCalculatorData {
     dumbbellRoundingSettingLbs: number;
     warmupSets: WarmupSet[];
 }
+export interface RecalculateSetPRProgress {
+    numWorkoutsProcessed: number;
+    numWorkoutsTotal: number;
+}
+export type RecalculateSetPRStatusResponse = {
+    type: 'ready';
+} | {
+    type: 'busy';
+    progress: RecalculateSetPRProgress;
+} | {
+    type: 'error';
+};
 export interface ExerciseTemplateUnit {
     id: number;
     exercise_template_id: string;

package/built/index.js

@@ -14,7 +14,7 @@ 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.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isWorkoutBiometrics = exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.supportedInstructionsLanguages = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.DefaultClientConfiguration = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = exports.isLanguage = exports.supportedLanguages = void 0;
+exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.supportedInstructionsLanguages = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.DefaultClientConfiguration = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = exports.isLanguage = exports.supportedLanguages = void 0;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
@@ -212,30 +212,6 @@ const isPublicWorkout = (x) => {
     return x.type === 'public';
 };
 exports.isPublicWorkout = isPublicWorkout;
-const isHeartRateSamples = (x) => {
-    if (!x)
-        return false;
-    if (Array.isArray(x)) {
-        for (const sample of x) {
-            if (typeof sample.timestamp_ms !== 'number' ||
-                typeof sample.bpm !== 'number') {
-                return false;
-            }
-        }
-    }
-    return true;
-};
-exports.isHeartRateSamples = isHeartRateSamples;
-const isWorkoutBiometrics = (x) => {
-    if (!x)
-        return false;
-    const maybeCalories = x.total_calories;
-    const maybeHeartRateSamples = x.heart_rate_samples;
-    const caloriesAreValid = !maybeCalories || (typeof maybeCalories === 'number' && maybeCalories >= 0);
-    return ((caloriesAreValid && !maybeHeartRateSamples) ||
-        (0, exports.isHeartRateSamples)(maybeHeartRateSamples));
-};
-exports.isWorkoutBiometrics = isWorkoutBiometrics;
 exports.measurementsList = [
     'weight_kg',
     'fat_percent',

package/built/normalizedWorkoutUtils.d.ts

@@ -1,4 +1,4 @@
-import { ExerciseType, RPE, SetType, ShareToPlatform, WorkoutBiometrics, WorkoutMedia, WorkoutVisibility } from '.';
+import { ExerciseType, RPE, SetType, ShareToPlatform, WorkoutMedia, WorkoutVisibility } from '.';
 /**
  * Events are used to determine the start time, end time and duration of a
  * `NormalizedWorkout`, in a way that can be persisted to disk.
@@ -29,12 +29,10 @@ export interface NormalizedWorkout {
     appleWatch: boolean;
     wearosWatch: boolean;
     workoutVisibility: WorkoutVisibility;
-    isWorkoutBiometricsPublic: boolean;
     shareTo: {
         [key in ShareToPlatform]: boolean;
     };
     clientId: string;
-    biometrics?: WorkoutBiometrics;
 }
 export interface NormalizedSet {
     index: number;

package/built/tests/testUtils.js

@@ -151,7 +151,6 @@ class WorkoutBuilder {
             appleWatch: false,
             wearosWatch: false,
             workoutVisibility: 'public',
-            isWorkoutBiometricsPublic: true,
             shareTo: {
                 strava: false,
                 appleHealth: false,

package/built/tests/workoutVolume.test.js

@@ -4,7 +4,10 @@ const workoutVolume_1 = require("../workoutVolume");
 describe('workoutVolume', () => {
     describe('estimatedWorkoutVolumeKg', () => {
         it('calculates the correct workout volume', () => {
-            const emptyWorkout = { exercises: [] };
+            const emptyWorkout = {
+                exercises: [],
+                include_warmup_sets: true,
+            };
             const weightRepsWorkout = {
                 exercises: [
                     {
@@ -14,6 +17,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: false,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 100,
                                 reps: 10,
                                 distance_meters: 0,
@@ -21,6 +25,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const pullUpWorkout = {
                 exercises: [
@@ -31,6 +36,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: true,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 0,
                                 reps: 10,
                                 distance_meters: 0,
@@ -38,6 +44,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const assistedPullUpWorkout = {
                 exercises: [
@@ -48,6 +55,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: true,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 10,
                                 reps: 10,
                                 distance_meters: 0,
@@ -55,6 +63,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const weightedPullUpWorkout = {
                 exercises: [
@@ -65,6 +74,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: true,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 10,
                                 reps: 10,
                                 distance_meters: 0,
@@ -72,6 +82,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const shortDistanceWeightWorkout = {
                 exercises: [
@@ -82,6 +93,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: false,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 100,
                                 reps: 0,
                                 distance_meters: 10,
@@ -89,6 +101,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             expect((0, workoutVolume_1.estimatedWorkoutVolumeKg)({
                 bodyweightKg: 100,
@@ -124,8 +137,49 @@ describe('workoutVolume', () => {
                         ...weightedPullUpWorkout.exercises,
                         ...shortDistanceWeightWorkout.exercises,
                     ],
+                    include_warmup_sets: true,
                 },
             })).toBe(5000);
         });
+        it('takes warmup sets into account only if `include_warmup_sets` === `true`', () => {
+            const workoutWithWarmupSets = {
+                exercises: [
+                    {
+                        exercise_type: 'weight_reps',
+                        exercise_template_id: 'asd',
+                        volume_doubling_enabled: false,
+                        hundred_percent_bodyweight_exercise: false,
+                        sets: [
+                            {
+                                indicator: 'warmup',
+                                weight_kg: 100,
+                                reps: 10,
+                                distance_meters: 0,
+                            },
+                            {
+                                indicator: 'normal',
+                                weight_kg: 100,
+                                reps: 10,
+                                distance_meters: 0,
+                            },
+                            {
+                                indicator: 'normal',
+                                weight_kg: 100,
+                                reps: 10,
+                                distance_meters: 0,
+                            },
+                        ],
+                    },
+                ],
+            };
+            expect((0, workoutVolume_1.estimatedWorkoutVolumeKg)({
+                bodyweightKg: 100,
+                workout: Object.assign(Object.assign({}, workoutWithWarmupSets), { include_warmup_sets: false }),
+            })).toBe(2000);
+            expect((0, workoutVolume_1.estimatedWorkoutVolumeKg)({
+                bodyweightKg: 100,
+                workout: Object.assign(Object.assign({}, workoutWithWarmupSets), { include_warmup_sets: true }),
+            })).toBe(3000);
+        });
     });
 });

package/built/workoutVolume.d.ts

@@ -1,4 +1,4 @@
-import { BodyMeasurement, ExerciseType, BaseExerciseTemplate } from '.';
+import { BodyMeasurement, ExerciseType, BaseExerciseTemplate, WorkoutExerciseSet } from '.';
 export declare const isVolumeDoublingSupportableForExerciseTemplate: (exerciseTemplate: Pick<BaseExerciseTemplate, "equipment_category" | "exercise_type">) => boolean;
 export interface VolumeCalculableWorkout {
     exercises: {
@@ -6,13 +6,9 @@ export interface VolumeCalculableWorkout {
         exercise_template_id: string;
         volume_doubling_enabled: boolean;
         hundred_percent_bodyweight_exercise: boolean;
-        sets: {
-            weight_kg?: number | null;
-            reps?: number | null;
-            distance_meters?: number | null;
-            duration_seconds?: number | null;
-        }[];
+        sets: Pick<WorkoutExerciseSet, 'indicator' | 'weight_kg' | 'reps' | 'distance_meters' | 'duration_seconds'>[];
     }[];
+    include_warmup_sets: boolean;
 }
 export interface TimestampedVolumeCalculableWorkout extends VolumeCalculableWorkout {
     start_time: number;

package/built/workoutVolume.js

@@ -98,7 +98,9 @@ const setVolumeKg = (set, bodyweightKg) => {
 exports.setVolumeKg = setVolumeKg;
 const workoutToWorkoutVolumeSets = (workout) => {
     const unflatSets = workout.exercises.map((e) => {
-        return e.sets.map((s) => {
+        return e.sets
+            .filter((s) => workout.include_warmup_sets || s.indicator !== 'warmup')
+            .map((s) => {
             var _a, _b, _c;
             return {
                 type: e.exercise_type || 'weight_reps',

package/package.json

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