hevy-shared 1.0.877 → 1.0.878

package/built/tests/utils.test.js

@@ -712,10 +712,13 @@ describe('utils', () => {
                 weight: 'kg',
                 distance: 'kilometers',
             },
-            labels: {
-                weight: 'kg',
-                distance: ' km',
-                shortDistance: ' m',
+            lokalizedLabels: {
+                kg: 'kg',
+                lbs: 'lbs',
+                km: 'km',
+                mi: 'mi',
+                m: 'm',
+                yd: 'yd',
                 steps: 'Steps',
                 floors: 'Floors',
             },
@@ -745,6 +748,58 @@ describe('utils', () => {
         it('formats weight with duration', () => {
             expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'weight_duration' }))).toBe('100 kg - 1min 30s');
         });
+        it('formats weights in kg', () => {
+            expect((0, utils_1.formatSetValue)({
+                set: {
+                    weight_kg: 100,
+                    reps: 12,
+                    duration_seconds: null,
+                    distance_meters: null,
+                    custom_metric: null,
+                },
+                units: {
+                    weight: 'kg',
+                    distance: 'kilometers',
+                },
+                lokalizedLabels: {
+                    kg: 'kg',
+                    lbs: 'lbs',
+                    km: 'km',
+                    mi: 'mi',
+                    m: 'm',
+                    yd: 'yd',
+                    steps: 'Steps',
+                    floors: 'Floors',
+                },
+                exerciseType: 'weight_reps',
+            })).toBe('100 kg x 12');
+        });
+        it('formats weights logged in lbs', () => {
+            expect((0, utils_1.formatSetValue)({
+                set: {
+                    weight_kg: 50,
+                    reps: 12,
+                    duration_seconds: null,
+                    distance_meters: null,
+                    custom_metric: null,
+                },
+                units: {
+                    weight: 'lbs',
+                    distance: 'kilometers',
+                },
+                lokalizedLabels: {
+                    kg: 'kg',
+                    lbs: 'lbs',
+                    km: 'km',
+                    mi: 'mi',
+                    m: 'm',
+                    yd: 'yd',
+                    steps: 'Steps',
+                    floors: 'Floors',
+                },
+                exerciseType: 'weight_reps',
+            })).toBe('110.23 lbs x 12');
+        });
         it('formats floors with duration', () => {
             expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'floors_duration' }))).toBe('15 Floors - 1min 30s');
         });

package/built/utils.d.ts

@@ -264,14 +264,17 @@ interface getSetValueParams {
         weight: WeightUnit;
         distance: DistanceUnit;
     };
-    labels: {
-        weight: string;
-        distance: string;
-        shortDistance: string;
+    lokalizedLabels: {
+        kg: string;
+        lbs: string;
+        km: string;
+        mi: string;
+        m: string;
+        yd: string;
         steps: string;
         floors: string;
     };
 }
-export declare const formatSetValue: ({ exerciseType, set, units, labels, }: getSetValueParams) => string;
+export declare const formatSetValue: ({ exerciseType, set, units, lokalizedLabels, }: getSetValueParams) => string;
 export declare const rawInstructionsToIndexedSteps: (rawInstructions: string) => ExerciseInstructionsStep[];
 export {};

package/built/utils.js

@@ -791,43 +791,56 @@ const exerciseWeight = (value, weightUnit) => {
     return (0, exports.roundToTwoDecimal)(value);
 };
 exports.exerciseWeight = exerciseWeight;
-const formatSetValue = ({ exerciseType, set, units, labels, }) => {
+const formatSetValue = ({ exerciseType, set, units, lokalizedLabels, }) => {
     var _a, _b, _c;
+    const unitToLabelMap = {
+        kg: lokalizedLabels.kg,
+        lbs: lokalizedLabels.lbs,
+        km: lokalizedLabels.km,
+        mi: lokalizedLabels.mi,
+        m: lokalizedLabels.m,
+        yd: lokalizedLabels.yd,
+        steps: lokalizedLabels.steps,
+        floors: lokalizedLabels.floors,
+    };
     switch (exerciseType) {
         case 'weight_reps':
         case 'bodyweight_reps': {
-            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${unitToLabelMap[units.weight]}`;
             const reps = `${(_a = set.reps) !== null && _a !== void 0 ? _a : 0}`;
             return `${weight} x ${reps}`;
         }
         case 'bodyweight_assisted_reps': {
-            const weight = `-${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const weight = `-${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${unitToLabelMap[units.weight]}`;
             const reps = `${(_b = set.reps) !== null && _b !== void 0 ? _b : 0}`;
             return `${weight} x ${reps}`;
         }
         case 'reps_only':
             return `${(_c = set.reps) !== null && _c !== void 0 ? _c : 0}`;
         case 'distance_duration': {
-            const distanceValue = `${(0, exports.distance)(set.distance_meters || 0, units.distance)}${labels.distance}`;
+            const distanceUnitShort = units.distance === 'kilometers' ? 'km' : 'mi';
+            const distanceValue = `${(0, exports.distance)(set.distance_meters || 0, units.distance)} ${unitToLabelMap[distanceUnitShort]}`;
             const duration = `${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
             return `${distanceValue} - ${duration}`;
         }
         case 'duration':
             return (0, exports.secondsToWordFormat)(Number(set.duration_seconds));
         case 'short_distance_weight': {
-            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${unitToLabelMap[units.weight]}`;
             const shortDistance = (0, exports.roundToTwoDecimal)(set.distance_meters || 0);
-            return `${weight} - ${shortDistance}${labels.shortDistance}`;
+            const shortDistanceUnitShort = units.distance === 'kilometers' ? 'm' : 'yd';
+            const shortDistanceUnitShortLabel = unitToLabelMap[shortDistanceUnitShort];
+            return `${weight} - ${shortDistance} ${shortDistanceUnitShortLabel}`;
         }
         case 'weight_duration': {
-            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${unitToLabelMap[units.weight]}`;
             const duration = `${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
             return `${weight} - ${duration}`;
         }
         case 'floors_duration':
-            return `${set.custom_metric ? (0, exports.roundToWholeNumber)(set.custom_metric) : 0} ${labels.floors} - ${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
+            return `${set.custom_metric ? (0, exports.roundToWholeNumber)(set.custom_metric) : 0} ${unitToLabelMap.floors} - ${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
         case 'steps_duration':
-            return `${set.custom_metric ? (0, exports.roundToWholeNumber)(set.custom_metric) : 0} ${labels.steps} - ${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
+            return `${set.custom_metric ? (0, exports.roundToWholeNumber)(set.custom_metric) : 0} ${unitToLabelMap.steps} - ${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
         default:
             (0, _1.exhaustiveTypeCheck)(exerciseType);
             return '';

package/package.json

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