hevy-shared 1.0.841 → 1.0.843

package/built/index.d.ts

@@ -570,7 +570,7 @@ export interface UserProfile {
     mutual_followers: PreviewMutualUser[];
 }
 export interface UserWorkoutStreakCount {
-    streak_count: number | undefined;
+    streak_count: number;
 }
 export interface PublicUserProfile {
     private_profile: boolean;
@@ -1864,6 +1864,3 @@ export interface FolderLinkPreviewMetadataResponse extends LinkPreviewMetadataRe
     username: string;
     routine_count: number;
 }
-export interface StartTimeableWorkout {
-    start_time: number;
-}

package/built/tests/utils.test.js

@@ -325,6 +325,139 @@ describe('utils', () => {
             expect((0, utils_1.formatDurationInput)('99:99')).toBe('99:99');
         });
     });
+    describe('getEstimatedExercisesDurationSeconds', () => {
+        const testCases = [
+            {
+                exercises: [
+                    {
+                        exercise_type: 'duration',
+                        rest_seconds: 10,
+                        sets: [{ duration_seconds: 50, indicator: 'normal' }],
+                    },
+                ],
+                expectedDuration: 50 + 10,
+            },
+            {
+                exercises: [
+                    {
+                        exercise_type: 'floors_duration',
+                        rest_seconds: 10,
+                        sets: [{ duration_seconds: 0, indicator: 'normal' }],
+                    },
+                ],
+                expectedDuration: 10,
+            },
+            {
+                exercises: [
+                    {
+                        exercise_type: 'weight_duration',
+                        rest_seconds: null,
+                        sets: [{ duration_seconds: 30, indicator: 'normal' }],
+                    },
+                ],
+                expectedDuration: 30 + utils_1.ESTIMATED_REST_TIMER_DURATION,
+            },
+            {
+                exercises: [
+                    {
+                        exercise_type: 'distance_duration',
+                        rest_seconds: 120,
+                        sets: [{ duration_seconds: 40, indicator: 'normal' }],
+                    },
+                ],
+                expectedDuration: 40 + 120,
+            },
+            {
+                exercises: [
+                    {
+                        exercise_type: 'weight_duration',
+                        rest_seconds: 120,
+                        sets: [{ duration_seconds: null, indicator: 'normal' }],
+                    },
+                ],
+                expectedDuration: 120 + utils_1.ESTIMATED_SET_DURATION,
+            },
+            {
+                exercises: [
+                    {
+                        exercise_type: 'duration',
+                        rest_seconds: 0,
+                        sets: [{ duration_seconds: null, indicator: 'normal' }],
+                    },
+                ],
+                expectedDuration: utils_1.ESTIMATED_SET_DURATION,
+            },
+            {
+                exercises: [
+                    {
+                        exercise_type: 'reps_only',
+                        rest_seconds: 180,
+                        sets: [{ duration_seconds: null, indicator: 'normal' }],
+                    },
+                    {
+                        exercise_type: 'reps_only',
+                        rest_seconds: 180,
+                        sets: [
+                            {
+                                duration_seconds: 0,
+                                indicator: 'normal',
+                            },
+                            {
+                                duration_seconds: 0,
+                                indicator: 'normal',
+                            },
+                            {
+                                duration_seconds: 0,
+                                indicator: 'normal',
+                            },
+                            {
+                                duration_seconds: 0,
+                                indicator: 'normal',
+                            },
+                        ],
+                    },
+                ],
+                expectedDuration: (180 + utils_1.ESTIMATED_SET_DURATION) * 5,
+            },
+            {
+                exercises: [
+                    {
+                        exercise_type: 'reps_only',
+                        rest_seconds: null,
+                        sets: [{ duration_seconds: null, indicator: 'normal' }],
+                    },
+                    {
+                        exercise_type: 'reps_only',
+                        rest_seconds: null,
+                        sets: [
+                            {
+                                duration_seconds: 0,
+                                indicator: 'normal',
+                            },
+                            {
+                                duration_seconds: 0,
+                                indicator: 'dropset',
+                            },
+                            {
+                                duration_seconds: 0,
+                                indicator: 'normal',
+                            },
+                            {
+                                duration_seconds: 0,
+                                indicator: 'dropset',
+                            },
+                        ],
+                    },
+                ],
+                expectedDuration: utils_1.ESTIMATED_REST_TIMER_DURATION * 3 + 5 * utils_1.ESTIMATED_SET_DURATION,
+            },
+        ];
+        testCases.forEach((testCase) => {
+            it(`getEstimatedExercisesDurationSeconds`, () => {
+                expect((0, utils_1.getEstimatedExercisesDurationSeconds)(testCase)).toBe(testCase.expectedDuration);
+            });
+        });
+    });
     describe('splitAtUsernamesAndLinks', () => {
         it('Takes a string and returns an array of FormatAtText', () => {
             const inputOutputs = [

package/built/utils.d.ts

@@ -1,5 +1,5 @@
 import { Dayjs } from 'dayjs';
-import { BaseExerciseTemplate, FormatAtText, Result, StartTimeableWorkout, StrengthLevel, UserExerciseSet, Weekday } from '.';
+import { BaseExerciseTemplate, ExerciseType, FormatAtText, Result, SetType, StrengthLevel, UserExerciseSet, UserFacingSetIndicator, Weekday } from '.';
 /**
  * Doesn't matter what you throw in the function it'll
  * always return a number. Non number values will return
@@ -176,14 +176,19 @@ export interface TotalSetCountWorkout {
  */
 export declare const userExerciseSetWeight: (set: UserExerciseSet, exerciseStore: BaseExerciseTemplate[], hundredPercentBodyweightExercise: boolean) => number;
 export declare const workoutSetCount: (w: TotalSetCountWorkout) => number;
+export declare const UserFacingIndicatorToSetIndicator: (indicator: UserFacingSetIndicator) => SetType;
 interface GetEstimatedExercisesDuration {
     exercises: {
         rest_seconds: number | null;
+        exercise_type: ExerciseType;
         sets: {
             duration_seconds?: number | null;
+            indicator: SetType;
         }[];
     }[];
 }
+export declare const ESTIMATED_SET_DURATION = 45;
+export declare const ESTIMATED_REST_TIMER_DURATION = 90;
 export declare const getEstimatedExercisesDurationSeconds: ({ exercises, }: GetEstimatedExercisesDuration) => number;
 export declare const oneRepMaxPercentageMap: {
     [s: number]: number;
@@ -237,7 +242,9 @@ export declare const splitAtUsernamesAndLinks: (text: string) => FormatAtText[];
 export declare const validateYoutubeUrl: (url: string) => boolean;
 export declare const getYoutubeVideoId: (url: string) => string | undefined;
 /**@param workouts must be sorted descending by start_time */
-export declare const calculateCurrentWeekStreak: (workouts: StartTimeableWorkout[], firstWeekday: Weekday, untilUnix?: number) => number;
+export declare const calculateCurrentWeekStreak: (workouts: {
+    start_time: number;
+}[], firstWeekday: Weekday, untilUnix?: number) => number;
 export declare const startOfWeek: (d: Dayjs, firstDayOfWeek: Weekday) => Dayjs;
 export declare const weekdayNumberMap: {
     [key in Weekday]: number;

package/built/utils.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.weekdayNumberMap = exports.startOfWeek = exports.calculateCurrentWeekStreak = exports.getYoutubeVideoId = exports.validateYoutubeUrl = exports.splitAtUsernamesAndLinks = exports.isVersionAGreaterOrEqualToVersionB = exports.generateUserGroupValue = exports.generateUserGroup = exports.isBaseExerciseTemplate = exports.getStrengthLevelFromPercentile = exports.numberToLocaleString = exports.numberWithCommas = exports.setVolume = exports.oneRepMax = exports.oneRepMaxPercentageMap = exports.getEstimatedExercisesDurationSeconds = exports.workoutSetCount = exports.userExerciseSetWeight = exports.workoutDistanceMeters = exports.workoutReps = exports.workoutDurationSeconds = exports.removeAccents = exports.getClosestDataPointAroundTargetDate = exports.getClosestDataPointBeforeTargetDate = exports.findMapped = exports.stringToNumber = exports.forceStringToNumber = exports.formatDurationInput = exports.isValidFormattedTime = exports.isWholeNumber = exports.isNumber = exports.isValidUuid = exports.isValidPhoneNumber = exports.isValidWebUrl = exports.URL_REGEX = exports.isValidEmail = exports.secondsToWordFormatMinutes = exports.secondsToWordFormat = exports.secondsToClockFormat = exports.secondsToClockParts = exports.isValidUsername = exports.roundToWholeNumber = exports.roundToOneDecimal = exports.roundToTwoDecimal = exports.divide = exports.clampNumber = exports.num = void 0;
+exports.startOfWeek = exports.calculateCurrentWeekStreak = exports.getYoutubeVideoId = exports.validateYoutubeUrl = exports.splitAtUsernamesAndLinks = exports.isVersionAGreaterOrEqualToVersionB = exports.generateUserGroupValue = exports.generateUserGroup = exports.isBaseExerciseTemplate = exports.getStrengthLevelFromPercentile = exports.numberToLocaleString = exports.numberWithCommas = exports.setVolume = exports.oneRepMax = exports.oneRepMaxPercentageMap = exports.getEstimatedExercisesDurationSeconds = exports.ESTIMATED_REST_TIMER_DURATION = exports.ESTIMATED_SET_DURATION = exports.UserFacingIndicatorToSetIndicator = exports.workoutSetCount = exports.userExerciseSetWeight = exports.workoutDistanceMeters = exports.workoutReps = exports.workoutDurationSeconds = exports.removeAccents = exports.getClosestDataPointAroundTargetDate = exports.getClosestDataPointBeforeTargetDate = exports.findMapped = exports.stringToNumber = exports.forceStringToNumber = exports.formatDurationInput = exports.isValidFormattedTime = exports.isWholeNumber = exports.isNumber = exports.isValidUuid = exports.isValidPhoneNumber = exports.isValidWebUrl = exports.URL_REGEX = exports.isValidEmail = exports.secondsToWordFormatMinutes = exports.secondsToWordFormat = exports.secondsToClockFormat = exports.secondsToClockParts = exports.isValidUsername = exports.roundToWholeNumber = exports.roundToOneDecimal = exports.roundToTwoDecimal = exports.divide = exports.clampNumber = exports.num = void 0;
+exports.weekdayNumberMap = void 0;
 const dayjs_1 = __importDefault(require("dayjs"));
 /**
  * Doesn't matter what you throw in the function it'll
@@ -448,18 +449,45 @@ const workoutSetCount = (w) => {
     }, 0);
 };
 exports.workoutSetCount = workoutSetCount;
-const ESTIMATED_SET_DURATION = 45;
-const ESTIMATED_REST_TIMER_DURATION = 90;
+const UserFacingIndicatorToSetIndicator = (indicator) => {
+    switch (indicator) {
+        case 'dropset':
+            return 'dropset';
+        case 'warmup':
+            return 'warmup';
+        case 'failure':
+            return 'failure';
+        default:
+            return 'normal';
+    }
+};
+exports.UserFacingIndicatorToSetIndicator = UserFacingIndicatorToSetIndicator;
+exports.ESTIMATED_SET_DURATION = 45;
+exports.ESTIMATED_REST_TIMER_DURATION = 90;
+const isDurationExercise = (type) => {
+    return (type === 'duration' ||
+        type === 'weight_duration' ||
+        type === 'distance_duration' ||
+        type === 'floors_duration' ||
+        type === 'steps_duration');
+};
 const getEstimatedExercisesDurationSeconds = ({ exercises, }) => {
     const totalSeconds = exercises.reduce((exercisesTotal, exercise) => {
         var _a;
-        const restPerSet = (_a = exercise.rest_seconds) !== null && _a !== void 0 ? _a : ESTIMATED_REST_TIMER_DURATION;
-        const exerciseTotal = exercise.sets.reduce((setTotal, set) => {
+        const restPerSet = (_a = exercise.rest_seconds) !== null && _a !== void 0 ? _a : exports.ESTIMATED_REST_TIMER_DURATION;
+        const setsTotal = exercise.sets.reduce((setTotal, set) => {
             var _a;
-            const duration = (_a = set.duration_seconds) !== null && _a !== void 0 ? _a : ESTIMATED_SET_DURATION;
+            // Sometimes we get 0 values for duration on exercises that aren't duration.
+            // Added this check to prevent having a estimated duration of 0 for these.
+            const duration = isDurationExercise(exercise.exercise_type)
+                ? (_a = set.duration_seconds) !== null && _a !== void 0 ? _a : exports.ESTIMATED_SET_DURATION
+                : exports.ESTIMATED_SET_DURATION;
+            // if it is a dropset, we don't add the rest time
+            if (set.indicator === 'dropset')
+                return setTotal + duration;
             return setTotal + duration + restPerSet;
         }, 0);
-        return exercisesTotal + exerciseTotal;
+        return exercisesTotal + setsTotal;
     }, 0);
     return totalSeconds;
 };
@@ -720,6 +748,7 @@ const calculateCurrentWeekStreak = (workouts, firstWeekday, untilUnix = (0, dayj
         }
         i += 1;
     }
+    // check if the current week has any workouts
     weekStart = (0, exports.startOfWeek)(dayjs_1.default.unix(untilUnix), firstWeekday);
     weekEnd = weekStart.add(1, 'week');
     if (workouts.find(({ start_time }) => start_time >= weekStart.unix() && start_time <= weekEnd.unix())) {

package/package.json

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