hevy-shared 1.0.640 → 1.0.641

package/built/muscleSplits.d.ts

@@ -7,10 +7,10 @@ interface SetCountableExercise {
     other_muscles: MuscleGroup[];
     sets: SetCountableSet[];
 }
-interface SetCountableWorkoutOrRoutine {
+export interface SetCountableWorkoutOrRoutine {
     exercises: SetCountableExercise[];
 }
-export declare const getSetContributionsForMuscleGroups: (muscle_group: MuscleGroup, other_muscles: MuscleGroup[]) => {
+export declare const calculateSetContributionsForSimplifiedMuscleGroups: (muscle_group: MuscleGroup, other_muscles: MuscleGroup[]) => {
     core: number;
     shoulders: number;
     arms: number;
@@ -26,5 +26,27 @@ export declare const calculateSimplifiedMuscleSplit: (workoutsOrRoutines: SetCou
     back: number;
     chest: number;
 };
-export declare const getSetCountPerMuscleGroups: (workout: SetCountableWorkoutOrRoutine, shouldIncludeWarmupSets: boolean) => Partial<{ [key in MuscleGroup]: number; }>;
+export declare const calculateSetContributionsForMuscleGroups: (muscleGroup: MuscleGroup, otherMuscles: MuscleGroup[]) => {
+    other: number;
+    abdominals: number;
+    shoulders: number;
+    chest: number;
+    lower_back: number;
+    biceps: number;
+    triceps: number;
+    upper_back: number;
+    quadriceps: number;
+    calves: number;
+    lats: number;
+    hamstrings: number;
+    glutes: number;
+    abductors: number;
+    adductors: number;
+    traps: number;
+    forearms: number;
+    neck: number;
+    cardio: number;
+    full_body: number;
+};
+export declare const calculateSetCountPerMuscleGroups: (workoutsOrRoutines: SetCountableWorkoutOrRoutine[], shouldIncludeWarmupSets: boolean) => { [key in MuscleGroup]: number; };
 export {};

package/built/muscleSplits.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSetCountPerMuscleGroups = exports.calculateSimplifiedMuscleSplit = exports.getSetContributionsForMuscleGroups = void 0;
+exports.calculateSetCountPerMuscleGroups = exports.calculateSetContributionsForMuscleGroups = exports.calculateSimplifiedMuscleSplit = exports.calculateSetContributionsForSimplifiedMuscleGroups = void 0;
 const intersection_1 = __importDefault(require("lodash/intersection"));
 const _1 = require(".");
-const getSetContributionsForMuscleGroups = (muscle_group, other_muscles) => {
+const calculateSetContributionsForSimplifiedMuscleGroups = (muscle_group, other_muscles) => {
     const getContribution = (mg) => {
         if (mg.includes(muscle_group)) {
             return 1;
@@ -28,7 +28,7 @@ const getSetContributionsForMuscleGroups = (muscle_group, other_muscles) => {
         chest: getContribution(_1.chestMuscles),
     };
 };
-exports.getSetContributionsForMuscleGroups = getSetContributionsForMuscleGroups;
+exports.calculateSetContributionsForSimplifiedMuscleGroups = calculateSetContributionsForSimplifiedMuscleGroups;
 const calculateSimplifiedMuscleSplit = (workoutsOrRoutines, shouldIncludeWarmupSets) => {
     const totals = {
         core: 0,
@@ -44,7 +44,7 @@ const calculateSimplifiedMuscleSplit = (workoutsOrRoutines, shouldIncludeWarmupS
                 ? exercise.sets
                 : exercise.sets.filter((s) => s.indicator !== 'warmup');
             const setCount = trimmedSets.length;
-            const contributions = (0, exports.getSetContributionsForMuscleGroups)(exercise.muscle_group, exercise.other_muscles);
+            const contributions = (0, exports.calculateSetContributionsForSimplifiedMuscleGroups)(exercise.muscle_group, exercise.other_muscles);
             totals.core += contributions.core * setCount;
             totals.shoulders += contributions.shoulders * setCount;
             totals.arms += contributions.arms * setCount;
@@ -56,16 +56,37 @@ const calculateSimplifiedMuscleSplit = (workoutsOrRoutines, shouldIncludeWarmupS
     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;
-        });
+const calculateSetContributionsForMuscleGroups = (muscleGroup, otherMuscles) => {
+    const getContribution = (mg) => {
+        if (mg === muscleGroup) {
+            return 1;
+        }
+        else if (otherMuscles.includes(mg)) {
+            return 0.5;
+        }
+        return 0;
+    };
+    return _1.muscleGroups.reduce((acc, mg) => {
+        acc[mg] = getContribution(mg);
         return acc;
     }, {});
 };
-exports.getSetCountPerMuscleGroups = getSetCountPerMuscleGroups;
+exports.calculateSetContributionsForMuscleGroups = calculateSetContributionsForMuscleGroups;
+const calculateSetCountPerMuscleGroups = (workoutsOrRoutines, shouldIncludeWarmupSets) => {
+    const totals = _1.muscleGroups.reduce((acc, muscleGroup) => {
+        acc[muscleGroup] = 0;
+        return acc;
+    }, {});
+    for (const workoutOrRoutine of workoutsOrRoutines) {
+        workoutOrRoutine.exercises.forEach((e) => {
+            const trimmedSets = shouldIncludeWarmupSets
+                ? e.sets
+                : e.sets.filter((s) => s.indicator !== 'warmup');
+            const setCount = trimmedSets.length;
+            const contributions = (0, exports.calculateSetContributionsForMuscleGroups)(e.muscle_group, e.other_muscles);
+            _1.muscleGroups.forEach((mg) => (totals[mg] += contributions[mg] * setCount));
+        });
+    }
+    return totals;
+};
+exports.calculateSetCountPerMuscleGroups = calculateSetCountPerMuscleGroups;

package/package.json

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