hevy-shared 1.0.844 → 1.0.845

package/built/index.d.ts

@@ -569,6 +569,9 @@ export interface UserProfile {
     weekly_workout_durations: WeeklyWorkoutDuration[];
     mutual_followers: PreviewMutualUser[];
 }
+export interface UserWorkoutStreakCount {
+    streak_count: number;
+}
 export interface PublicUserProfile {
     private_profile: boolean;
     username: string;

package/built/tests/utils.test.js

@@ -1,5 +1,9 @@
 "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', () => {
@@ -639,4 +643,60 @@ 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,4 +1,5 @@
-import { BaseExerciseTemplate, ExerciseType, FormatAtText, Result, SetType, StrengthLevel, UserExerciseSet, UserFacingSetIndicator } from '.';
+import { Dayjs } from 'dayjs';
+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
@@ -240,4 +241,12 @@ 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: {
+    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;
+};
 export {};

package/built/utils.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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
  * always return a number. Non number values will return
@@ -716,3 +721,57 @@ 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;
+    }
+    // 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())) {
+        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.844",
+  "version": "1.0.845",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
@@ -46,6 +46,7 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
+    "dayjs": "^1.11.19",
     "lodash": "^4.17.21"
   }
 }