hevy-shared 1.0.605 → 1.0.606

package/built/index.d.ts

@@ -1589,7 +1589,7 @@ export interface CancelSubscriptionFeedback extends BaseFeedback {
     };
 }
 export type Feedback = GeneralFeedback | FeatureRequestFeedback | BugReportFeedback | GetHelpFeedback | ReportCommentFeedback | ReportWorkoutFeedback | ReportProfileFeedback | RatingPromptFeedback | CancelSubscriptionFeedback;
-export type SuggestedUserSource = 'popular' | 'local' | 'contact' | 'mutual_follows' | 'follows_you' | 'featured' | 'hyper_local';
+export type SuggestedUserSource = 'popular' | 'local' | 'contact' | 'mutual_follows' | 'follows_you' | 'featured';
 export type SuggestedUserLabel = 'contact' | 'mutual_friends' | 'follows_you' | 'featured';
 export interface SuggestedUser {
     id: string;

package/built/utils.d.ts

@@ -167,7 +167,7 @@ export interface TotalSetCountWorkout {
  * Calculate the set weight for a given user exercise set
  * to be used in the exercise stats calculations on the web and coach app
  */
-export declare const userExerciseSetWeight: (set: UserExerciseSet, exerciseStore: BaseExerciseTemplate[]) => number;
+export declare const userExerciseSetWeight: (set: UserExerciseSet, exerciseStore: BaseExerciseTemplate[], hundredPercentBodyweightExercise: boolean) => number;
 export declare const workoutSetCount: (w: TotalSetCountWorkout) => number;
 export declare const oneRepMaxPercentageMap: {
     [s: number]: number;
@@ -199,14 +199,6 @@ type GenerateUserGroupError = 'invalid-number-of-groups' | 'invalid-uuid' | 'uui
  * `(userId, numGroups)` pair, or an error, inside a Result<T> object
  */
 export declare const generateUserGroup: (userId: string, numGroups: number) => Result<number, GenerateUserGroupError>;
-/**
- * Get the user group value for a given user id and number of groups.
- * @param userId a v4 UUID; _must_ be v4 to ensure random distribution
- * @param numGroups number of possible groups, from 2 to 2^32
- * @returns User group value (A, B, C, etc.), or undefined if the user id is not a v4 UUID
- * or if an error occurs.
- */
-export declare const generateUserGroupValue: (userId: string, numGroups: 2 | 3) => "A" | "B" | "C" | undefined;
 /**
  * @example
  * isVersionAGreaterOrEqualToVersionB('1.2.3', '1.2')    // true

package/built/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 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.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.isValidUsername = exports.roundToWholeNumber = exports.roundToOneDecimal = exports.roundToTwoDecimal = exports.divide = exports.clampNumber = exports.num = void 0;
+exports.getYoutubeVideoId = exports.validateYoutubeUrl = exports.splitAtUsernamesAndLinks = exports.isVersionAGreaterOrEqualToVersionB = exports.generateUserGroup = exports.isBaseExerciseTemplate = exports.getStrengthLevelFromPercentile = exports.numberToLocaleString = exports.numberWithCommas = exports.setVolume = exports.oneRepMax = exports.oneRepMaxPercentageMap = 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.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
@@ -404,20 +404,25 @@ exports.workoutDistanceMeters = workoutDistanceMeters;
  * Calculate the set weight for a given user exercise set
  * to be used in the exercise stats calculations on the web and coach app
  */
-const userExerciseSetWeight = (set, exerciseStore) => {
+const userExerciseSetWeight = (set, exerciseStore, hundredPercentBodyweightExercise) => {
     if (!set)
         return 0;
     const exercise = exerciseStore.find((e) => e.id === set.exercise_template_id);
     if (!exercise) {
         return (0, exports.num)(set.weight_kg);
     }
-    //!! This is wrong!!
-    // TODO: we should check if it's a hundred percent bodyweight exercise or not first
     if (exercise.exercise_type === 'bodyweight_reps') {
-        return (0, exports.num)(set.user_bodyweight_kg) + (0, exports.num)(set.weight_kg);
+        return hundredPercentBodyweightExercise
+            ? (0, exports.num)(set.user_bodyweight_kg) + (0, exports.num)(set.weight_kg)
+            : (0, exports.num)(set.weight_kg);
     }
     else if (exercise.exercise_type === 'bodyweight_assisted_reps') {
-        return Math.max((0, exports.num)(set.user_bodyweight_kg) - (0, exports.num)(set.weight_kg), 0);
+        return hundredPercentBodyweightExercise
+            ? Math.max((0, exports.num)(set.user_bodyweight_kg) - (0, exports.num)(set.weight_kg), 0)
+            : 0;
+    }
+    else if (exercise.exercise_type === 'reps_only') {
+        return hundredPercentBodyweightExercise ? (0, exports.num)(set.user_bodyweight_kg) : 0;
     }
     else {
         return (0, exports.num)(set.weight_kg);
@@ -542,32 +547,6 @@ const generateUserGroup = (userId, numGroups) => {
     };
 };
 exports.generateUserGroup = generateUserGroup;
-/**
- * Get the user group value for a given user id and number of groups.
- * @param userId a v4 UUID; _must_ be v4 to ensure random distribution
- * @param numGroups number of possible groups, from 2 to 2^32
- * @returns User group value (A, B, C, etc.), or undefined if the user id is not a v4 UUID
- * or if an error occurs.
- */
-const generateUserGroupValue = (userId, numGroups) => {
-    const group = (0, exports.generateUserGroup)(userId, numGroups);
-    if (group.isSuccess) {
-        switch (group.value) {
-            case 0:
-                return 'A';
-            case 1:
-                return 'B';
-            case 2:
-                return 'C';
-            default:
-                return undefined;
-        }
-    }
-    else {
-        return undefined;
-    }
-};
-exports.generateUserGroupValue = generateUserGroupValue;
 /**
  * @example
  * isVersionAGreaterOrEqualToVersionB('1.2.3', '1.2')    // true

package/package.json

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