hevy-shared 1.0.842 → 1.0.844

package/built/index.d.ts

@@ -569,9 +569,6 @@ export interface UserProfile {
     weekly_workout_durations: WeeklyWorkoutDuration[];
     mutual_followers: PreviewMutualUser[];
 }
-export interface UserWorkoutStreakCount {
-    streak_count: number;
-}
 export interface PublicUserProfile {
     private_profile: boolean;
     username: string;
@@ -1864,6 +1861,3 @@ export interface FolderLinkPreviewMetadataResponse extends LinkPreviewMetadataRe
     username: string;
     routine_count: number;
 }
-export interface StartTimeableWorkout {
-    start_time: number;
-}

package/built/tests/utils.test.js

@@ -1,9 +1,5 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const dayjs_1 = __importDefault(require("dayjs"));
 const utils_1 = require("../utils");
 describe('utils', () => {
     describe('isValidUsername', () => {
@@ -325,6 +321,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 = [
@@ -510,60 +639,4 @@ describe('utils', () => {
             expect((0, utils_1.getYoutubeVideoId)('https://www.youtube.com/watch?v=dQw4w9WgXcQ&ab_channel=RickAstleyVEVO')).toBe('dQw4w9WgXcQ');
         });
     });
-    describe('calculateCurrentWeekStreak', () => {
-        it("Doesn't include gaps in the streak count", () => {
-            const workouts = [
-                { start_time: (0, dayjs_1.default)('2025-11-05').unix() },
-                { start_time: (0, dayjs_1.default)('2025-11-02').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-31').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-23').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-10').unix() },
-            ];
-            const firstWeekday = 'sunday';
-            const untilUnix = (0, dayjs_1.default)('2025-11-06').unix();
-            expect((0, utils_1.calculateCurrentWeekStreak)(workouts, firstWeekday, untilUnix)).toBe(3);
-        });
-        it("Calculates a potentially non-zero streak when the user hasn't worked out this week yet", () => {
-            const workouts = [
-                { start_time: (0, dayjs_1.default)('2025-10-31').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-23').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-20').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-14').unix() + 1 },
-                { start_time: (0, dayjs_1.default)('2025-10-12').unix() },
-            ];
-            const firstWeekday = 'monday';
-            const untilUnix = (0, dayjs_1.default)('2025-11-06').unix();
-            expect((0, utils_1.calculateCurrentWeekStreak)(workouts, firstWeekday, untilUnix)).toBe(4);
-        });
-        it('Includes this week in the streak count if the user worked out this week', () => {
-            const workouts = [
-                { start_time: (0, dayjs_1.default)('2025-11-05').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-31').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-23').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-20').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-14').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-07').unix() },
-            ];
-            const firstWeekday = 'monday';
-            const untilUnix = (0, dayjs_1.default)('2025-11-06').unix();
-            expect((0, utils_1.calculateCurrentWeekStreak)(workouts, firstWeekday, untilUnix)).toBe(5);
-        });
-        it("Returns 0 if the user hasn't worked out", () => {
-            const workouts = [];
-            const firstWeekday = 'friday';
-            const untilUnix = (0, dayjs_1.default)('2025-10-10').unix();
-            expect((0, utils_1.calculateCurrentWeekStreak)(workouts, firstWeekday, untilUnix)).toBe(0);
-        });
-        it('Returns 0 if the user has not worked out this week and last week', () => {
-            const workouts = [
-                { start_time: (0, dayjs_1.default)('2025-10-23').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-20').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-13').unix() },
-                { start_time: (0, dayjs_1.default)('2025-10-07').unix() },
-            ];
-            const firstWeekday = 'sunday';
-            const untilUnix = (0, dayjs_1.default)('2025-11-05').unix();
-            expect((0, utils_1.calculateCurrentWeekStreak)(workouts, firstWeekday, untilUnix)).toBe(0);
-        });
-    });
 });

package/built/utils.d.ts

@@ -1,5 +1,4 @@
-import { Dayjs } from 'dayjs';
-import { BaseExerciseTemplate, FormatAtText, Result, StartTimeableWorkout, StrengthLevel, UserExerciseSet, Weekday } from '.';
+import { BaseExerciseTemplate, ExerciseType, FormatAtText, Result, SetType, StrengthLevel, UserExerciseSet, UserFacingSetIndicator } from '.';
 /**
  * Doesn't matter what you throw in the function it'll
  * always return a number. Non number values will return
@@ -176,14 +175,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;
@@ -236,10 +240,4 @@ export declare const isVersionAGreaterOrEqualToVersionB: (versionA: string, vers
 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 startOfWeek: (d: Dayjs, firstDayOfWeek: Weekday) => Dayjs;
-export declare const weekdayNumberMap: {
-    [key in Weekday]: number;
-};
 export {};

package/built/utils.js

@@ -1,10 +1,6 @@
 "use strict";
-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;
-const dayjs_1 = __importDefault(require("dayjs"));
+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;
 /**
  * Doesn't matter what you throw in the function it'll
  * always return a number. Non number values will return
@@ -142,7 +138,7 @@ exports.URL_REGEX = RegExp([
     // followed by the top-level domain
     /[a-z]{2,10}/,
     // optionally followed by a path
-    /(\/[-a-z0-9@:%_+.~#?&/=]*)?/,
+    /(\/[-a-z0-9@:%_+.~#?!&/=]*)?/,
 ]
     .map((r) => r.source)
     .join(''));
@@ -448,18 +444,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;
 };
@@ -693,56 +716,3 @@ const getYoutubeVideoId = (url) => {
     return match && match[1] && match[1].length === 11 ? match[1] : undefined;
 };
 exports.getYoutubeVideoId = getYoutubeVideoId;
-/**@param workouts must be sorted descending by start_time */
-const calculateCurrentWeekStreak = (workouts, firstWeekday, untilUnix = (0, dayjs_1.default)().unix()) => {
-    let streakCount = 0;
-    let weekStart = (0, exports.startOfWeek)(dayjs_1.default.unix(untilUnix), firstWeekday).subtract(1, 'week');
-    let weekEnd = weekStart.add(1, 'week');
-    let i = 0;
-    /** Iterate through the workouts from most recent to least and keep track of the week-long
-     * sliding window in which there needs to be a workout present in order for the streak to count.
-     * If there is a workout present during this window, move the window into the past by a week
-     * and keep iterating through the workouts. If there are no workouts during this window,
-     * the streak count is not incremented.
-     */
-    while (i < workouts.length) {
-        const workoutStart = workouts[i].start_time;
-        if (workoutStart >= weekStart.unix() && workoutStart <= weekEnd.unix()) {
-            streakCount += 1;
-            weekStart = weekStart.subtract(1, 'week');
-            weekEnd = weekEnd.subtract(1, 'week');
-        }
-        else if (workoutStart < weekStart.unix()) {
-            /** This workout is before the sliding window. We don't get to this point unless
-             * the user didn't workout during the window. So that means the streak is over
-             */
-            break;
-        }
-        i += 1;
-    }
-    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())) {
-        streakCount += 1;
-    }
-    return streakCount;
-};
-exports.calculateCurrentWeekStreak = calculateCurrentWeekStreak;
-const startOfWeek = (d, firstDayOfWeek) => {
-    const firstDayOfWeekIndex = exports.weekdayNumberMap[firstDayOfWeek];
-    let testDay = d;
-    while (testDay.day() !== firstDayOfWeekIndex) {
-        testDay = testDay.subtract(1, 'day');
-    }
-    return testDay.startOf('day');
-};
-exports.startOfWeek = startOfWeek;
-exports.weekdayNumberMap = {
-    sunday: 0,
-    monday: 1,
-    tuesday: 2,
-    wednesday: 3,
-    thursday: 4,
-    friday: 5,
-    saturday: 6,
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.842",
+  "version": "1.0.844",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
@@ -46,7 +46,6 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "dayjs": "^1.11.19",
     "lodash": "^4.17.21"
   }
 }