hevy-shared 1.0.604 → 1.0.606

package/built/index.d.ts

@@ -579,12 +579,6 @@ export declare const isExerciseType: (x: any) => x is ExerciseType;
 export type CustomExerciseType = Exclude<ExerciseType, 'floors_duration' | 'steps_duration'>;
 export declare const customExericseTypes: CustomExerciseType[];
 export declare const isCustomExerciseType: (x: any) => x is CustomExerciseType;
-export declare const trainingGoals: readonly ["strength", "build_muscle", "fat_loss"];
-export declare const trainingLevels: readonly ["beginner", "intermediate", "advanced"];
-export declare const exerciseCategories: readonly ["isolation", "compound", "assistance-compound"];
-export type TrainingGoal = Lookup<typeof trainingGoals>;
-export type TrainingLevel = Lookup<typeof trainingLevels>;
-export type ExerciseCategory = Lookup<typeof exerciseCategories>;
 /**
  * Base properties that all exercise templates must have
  */
@@ -631,9 +625,6 @@ export interface LibraryExercise extends BaseExerciseTemplate {
     localised_instructions?: {
         [language in InstructionsLanguage]?: string;
     };
-    goal: TrainingGoal[] | undefined;
-    level: TrainingLevel[] | undefined;
-    category: ExerciseCategory | undefined;
 }
 /**
  * Custom exercises are user-created templates with minimal properties

package/built/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isWorkoutBiometrics = exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.exerciseCategories = exports.trainingLevels = exports.trainingGoals = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.DefaultClientConfiguration = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = exports.isLanguage = exports.supportedLanguages = void 0;
+exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isWorkoutBiometrics = exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.DefaultClientConfiguration = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = exports.isLanguage = exports.supportedLanguages = void 0;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
@@ -185,13 +185,6 @@ exports.isExerciseType = isExerciseType;
 exports.customExericseTypes = exports.exerciseTypes.filter((type) => type !== 'floors_duration' && type !== 'steps_duration');
 const isCustomExerciseType = (x) => (0, typeUtils_1.isInArray)(x, exports.customExericseTypes);
 exports.isCustomExerciseType = isCustomExerciseType;
-exports.trainingGoals = ['strength', 'build_muscle', 'fat_loss'];
-exports.trainingLevels = ['beginner', 'intermediate', 'advanced'];
-exports.exerciseCategories = [
-    'isolation',
-    'compound',
-    'assistance-compound',
-];
 exports.supportedInstructionsLanguages = [
     'en',
     'it',

package/built/tests/utils.test.js

@@ -392,6 +392,18 @@ describe('utils', () => {
                         { format: 'link', text: 'https://example.com' },
                     ],
                 ],
+                [
+                    'hey Test - https://www.tiktok.com/@tylerpath/video/7471271437467405614 @test',
+                    [
+                        { format: 'none', text: 'hey Test - ' },
+                        {
+                            format: 'link',
+                            text: 'https://www.tiktok.com/@tylerpath/video/7471271437467405614',
+                        },
+                        { format: 'none', text: ' ' },
+                        { format: '@', text: '@test' },
+                    ],
+                ],
             ];
             inputOutputs.forEach((i) => {
                 expect((0, utils_1.splitAtUsernamesAndLinks)(i[0])).toEqual(i[1]);

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;

package/built/utils.js

@@ -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);
@@ -586,12 +591,12 @@ const splitAtUsernamesAndLinks = (text) => {
         if (index > lastIndex) {
             format.push({ format: 'none', text: text.substring(lastIndex, index) });
         }
-        if (match.match(mentionsRegex)) {
-            format.push({ format: '@', text: match });
-        }
-        else if (match.match(linksRegex)) {
+        if (match.match(linksRegex)) {
             format.push({ format: 'link', text: match });
         }
+        else if (match.match(mentionsRegex)) {
+            format.push({ format: '@', text: match });
+        }
         lastIndex = index + match.length;
     });
     if (lastIndex < text.length) {

package/package.json

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