hevy-shared 1.0.634 → 1.0.636

package/built/index.d.ts

@@ -549,10 +549,20 @@ export interface PublicUserProfile {
     weekly_workout_durations: WeeklyWorkoutDuration[];
     last_workout?: Workout;
 }
-export declare const muscleGroups: readonly ["abdominals", "abductors", "adductors", "biceps", "lower_back", "upper_back", "cardio", "chest", "calves", "forearms", "glutes", "hamstrings", "lats", "quadriceps", "shoulders", "triceps", "traps", "neck", "full_body", "other"];
+export declare const coreMuscles: readonly ["abdominals"];
+export declare const shoulderMuscles: readonly ["shoulders"];
+export declare const armMuscles: readonly ["biceps", "triceps", "forearms"];
+export declare const legMuscles: readonly ["quadriceps", "hamstrings", "calves", "glutes", "abductors", "adductors"];
+export declare const backMuscles: readonly ["lats", "traps", "lower_back", "upper_back"];
+export declare const chestMuscles: readonly ["chest"];
+export declare const miscellaneousMuscles: readonly ["cardio", "neck", "full_body", "other"];
+export declare const simplifiedMuscleGroups: readonly ["core", "shoulders", "arms", "legs", "back", "chest"];
+export type SimplifiedMuscleGroup = Lookup<typeof simplifiedMuscleGroups>;
+export declare const isSimplifiedMuscleGroup: (x: string) => x is SimplifiedMuscleGroup;
+export declare const muscleGroups: readonly ["abdominals", "shoulders", "biceps", "triceps", "forearms", "quadriceps", "hamstrings", "calves", "glutes", "abductors", "adductors", "lats", "traps", "lower_back", "upper_back", "chest", "cardio", "neck", "full_body", "other"];
 export type MuscleGroup = Lookup<typeof muscleGroups>;
 export declare const isMuscleGroup: (x: string) => x is MuscleGroup;
-export declare const muscleGroupFilters: readonly ["all_muscles", "abdominals", "abductors", "adductors", "biceps", "lower_back", "upper_back", "cardio", "chest", "calves", "forearms", "glutes", "hamstrings", "lats", "quadriceps", "shoulders", "triceps", "traps", "neck", "full_body", "other"];
+export declare const muscleGroupFilters: readonly ["all_muscles", "abdominals", "shoulders", "biceps", "triceps", "forearms", "quadriceps", "hamstrings", "calves", "glutes", "abductors", "adductors", "lats", "traps", "lower_back", "upper_back", "chest", "cardio", "neck", "full_body", "other"];
 export type MuscleGroupFilter = Lookup<typeof muscleGroupFilters>;
 export declare const isMuscleGroupFilter: (x: string) => x is MuscleGroupFilter;
 /**
@@ -740,6 +750,12 @@ export interface WorkoutExercise {
     volume_doubling_enabled: boolean;
     sets: WorkoutExerciseSet[];
 }
+export type WorkoutLike = {
+    id: number;
+    user_id: string;
+    profile_pic?: string;
+    username: string;
+};
 export interface WorkoutComment {
     id: number;
     username: string;
@@ -768,9 +784,11 @@ export interface Workout {
     index: number;
     name: string;
     description?: string;
+    /** @deprecated 2.3.4 */
     like_count: number;
+    /** @deprecated 2.3.4 */
     like_images: string[];
-    liked_by_username: string | undefined;
+    workout_likes: WorkoutLike[];
     comment_count: number;
     comments: WorkoutComment[];
     /** @deprecated 1.28.13 */

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.isSetPersonalRecordType = exports.supportedInstructionsLanguages = 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.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.isWorkoutBiometrics = exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = 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.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.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);
@@ -104,28 +104,49 @@ const _supportedProStores = [
     'paddle',
     'hevy-coach',
 ];
-exports.muscleGroups = [
-    'abdominals',
+exports.coreMuscles = ['abdominals'];
+exports.shoulderMuscles = ['shoulders'];
+exports.armMuscles = ['biceps', 'triceps', 'forearms'];
+exports.legMuscles = [
+    'quadriceps',
+    'hamstrings',
+    'calves',
+    'glutes',
     'abductors',
     'adductors',
-    'biceps',
+];
+exports.backMuscles = [
+    'lats',
+    'traps',
     'lower_back',
     'upper_back',
+];
+exports.chestMuscles = ['chest'];
+exports.miscellaneousMuscles = [
     'cardio',
-    'chest',
-    'calves',
-    'forearms',
-    'glutes',
-    'hamstrings',
-    'lats',
-    'quadriceps',
-    'shoulders',
-    'triceps',
-    'traps',
     'neck',
     'full_body',
     'other',
 ];
+exports.simplifiedMuscleGroups = [
+    'core',
+    'shoulders',
+    'arms',
+    'legs',
+    'back',
+    'chest',
+];
+const isSimplifiedMuscleGroup = (x) => (0, typeUtils_1.isInArray)(x, exports.simplifiedMuscleGroups);
+exports.isSimplifiedMuscleGroup = isSimplifiedMuscleGroup;
+exports.muscleGroups = [
+    ...exports.coreMuscles,
+    ...exports.shoulderMuscles,
+    ...exports.armMuscles,
+    ...exports.legMuscles,
+    ...exports.backMuscles,
+    ...exports.chestMuscles,
+    ...exports.miscellaneousMuscles,
+];
 const isMuscleGroup = (x) => (0, typeUtils_1.isInArray)(x, exports.muscleGroups);
 exports.isMuscleGroup = isMuscleGroup;
 exports.muscleGroupFilters = ['all_muscles', ...exports.muscleGroups];

package/built/muscleSplits.d.ts

@@ -1,5 +1,16 @@
-import { Workout, BaseRoutine } from '.';
-export declare const calculateMuscleSplit: (workoutsOrRoutines: Workout[] | BaseRoutine[]) => {
+import { MuscleGroup, SetType } from '.';
+interface SetCountableSet {
+    indicator: SetType;
+}
+interface SetCountableExercise {
+    muscle_group: MuscleGroup;
+    other_muscles: MuscleGroup[];
+    sets: SetCountableSet[];
+}
+interface SetCountableWorkoutOrRoutine {
+    exercises: SetCountableExercise[];
+}
+export declare const getSetContributionsForMuscleGroups: (muscle_group: MuscleGroup, other_muscles: MuscleGroup[]) => {
     core: number;
     shoulders: number;
     arms: number;
@@ -7,3 +18,13 @@ export declare const calculateMuscleSplit: (workoutsOrRoutines: Workout[] | Base
     back: number;
     chest: number;
 };
+export declare const calculateSimplifiedMuscleSplit: (workoutsOrRoutines: SetCountableWorkoutOrRoutine[], shouldIncludeWarmupSets: boolean) => {
+    core: number;
+    shoulders: number;
+    arms: number;
+    legs: number;
+    back: number;
+    chest: number;
+};
+export declare const getSetCountPerMuscleGroups: (workout: SetCountableWorkoutOrRoutine, shouldIncludeWarmupSets: boolean) => Partial<{ [key in MuscleGroup]: number; }>;
+export {};

package/built/muscleSplits.js

@@ -3,63 +3,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateMuscleSplit = void 0;
+exports.getSetCountPerMuscleGroups = exports.calculateSimplifiedMuscleSplit = exports.getSetContributionsForMuscleGroups = void 0;
 const intersection_1 = __importDefault(require("lodash/intersection"));
-const calculateMuscleSplit = (workoutsOrRoutines) => {
-    const coreMuscles = ['abdominals'];
-    const shoulderMuscles = ['shoulders'];
-    const armMuscles = ['biceps', 'triceps', 'forearms'];
-    const legMuscles = [
-        'quadriceps',
-        'hamstrings',
-        'glutes',
-        'calves',
-        'abductors',
-        'adductors',
-    ];
-    const backMuscles = [
-        'lower_back',
-        'upper_back',
-        'lats',
-        'traps',
-    ];
-    const chestMuscles = ['chest'];
-    let core = 0;
-    let shoulders = 0;
-    let arms = 0;
-    let legs = 0;
-    let back = 0;
-    let chest = 0;
-    const muscleGroupValueIncrement = (e, mg) => {
-        let increment = 0;
-        if (mg.includes(e.muscle_group)) {
-            increment += e.sets.length;
+const _1 = require(".");
+const getSetContributionsForMuscleGroups = (muscle_group, other_muscles) => {
+    const getContribution = (mg) => {
+        if (mg.includes(muscle_group)) {
+            return 1;
         }
-        else if ((0, intersection_1.default)(mg, e.other_muscles).length) {
-            increment += e.sets.length / 2;
+        else if ((0, intersection_1.default)(mg, other_muscles).length) {
+            return 0.5;
         }
-        else if (e.muscle_group === 'full_body') {
-            increment += e.sets.length / 6;
+        else if (muscle_group === 'full_body') {
+            return 1 / 6;
         }
-        return increment;
+        return 0;
     };
-    for (const workout of workoutsOrRoutines) {
-        for (const exercise of workout.exercises) {
-            core += muscleGroupValueIncrement(exercise, coreMuscles);
-            shoulders += muscleGroupValueIncrement(exercise, shoulderMuscles);
-            arms += muscleGroupValueIncrement(exercise, armMuscles);
-            legs += muscleGroupValueIncrement(exercise, legMuscles);
-            back += muscleGroupValueIncrement(exercise, backMuscles);
-            chest += muscleGroupValueIncrement(exercise, chestMuscles);
-        }
-    }
     return {
-        core,
-        shoulders,
-        arms,
-        legs,
-        back,
-        chest,
+        core: getContribution(_1.coreMuscles),
+        shoulders: getContribution(_1.shoulderMuscles),
+        arms: getContribution(_1.armMuscles),
+        legs: getContribution(_1.legMuscles),
+        back: getContribution(_1.backMuscles),
+        chest: getContribution(_1.chestMuscles),
+    };
+};
+exports.getSetContributionsForMuscleGroups = getSetContributionsForMuscleGroups;
+const calculateSimplifiedMuscleSplit = (workoutsOrRoutines, shouldIncludeWarmupSets) => {
+    const totals = {
+        core: 0,
+        shoulders: 0,
+        arms: 0,
+        legs: 0,
+        back: 0,
+        chest: 0,
     };
+    for (const workoutOrRoutine of workoutsOrRoutines) {
+        for (const exercise of workoutOrRoutine.exercises) {
+            const trimmedSets = shouldIncludeWarmupSets
+                ? exercise.sets
+                : exercise.sets.filter((s) => s.indicator !== 'warmup');
+            const setCount = trimmedSets.length;
+            const contributions = (0, exports.getSetContributionsForMuscleGroups)(exercise.muscle_group, exercise.other_muscles);
+            totals.core += contributions.core * setCount;
+            totals.shoulders += contributions.shoulders * setCount;
+            totals.arms += contributions.arms * setCount;
+            totals.legs += contributions.legs * setCount;
+            totals.back += contributions.back * setCount;
+            totals.chest += contributions.chest * setCount;
+        }
+    }
+    return totals;
+};
+exports.calculateSimplifiedMuscleSplit = calculateSimplifiedMuscleSplit;
+const getSetCountPerMuscleGroups = (workout, shouldIncludeWarmupSets) => {
+    return workout.exercises.reduce((acc, e) => {
+        const trimmedSets = shouldIncludeWarmupSets
+            ? e.sets
+            : e.sets.filter((s) => s.indicator !== 'warmup');
+        acc[e.muscle_group] = (acc[e.muscle_group] || 0) + trimmedSets.length;
+        e.other_muscles.forEach((muscle) => {
+            acc[muscle] = (acc[muscle] || 0) + trimmedSets.length / 2;
+        });
+        return acc;
+    }, {});
 };
-exports.calculateMuscleSplit = calculateMuscleSplit;
+exports.getSetCountPerMuscleGroups = getSetCountPerMuscleGroups;

package/package.json

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