hevy-shared 1.0.1038 → 1.0.1040

package/built/index.d.ts

@@ -29,7 +29,6 @@ export * from './hevyTrainer';
 export * from './translations';
 export * from './exerciseLocaleUtils';
 export * from './getVolumeComparison';
-export * from './geography';
 export type WeightUnit = 'kg' | 'lbs';
 export declare const isWeightUnit: (x: string) => x is WeightUnit;
 export type DistanceUnit = 'kilometers' | 'miles';
@@ -1401,19 +1400,15 @@ export interface UserMetadataResponse {
 export interface NetworkInfoRequest {
     networkType: NetworkType;
 }
-export type CommercialGym = {
+type CommercialGym = {
     type: 'commercial';
     id: string;
     name: string;
     fullAddress: string;
     city: string;
-    latitude: number;
-    longitude: number;
+    distanceM: number;
 };
-export type HomeGym = {
-    type: 'home';
-};
-export type Gym = CommercialGym | HomeGym;
+export type Gym = CommercialGym;
 export interface StripePrice {
     product_id: string;
     billing_period: 'month' | 'year' | 'pay-once';

package/built/index.js

@@ -41,7 +41,6 @@ __exportStar(require("./hevyTrainer"), exports);
 __exportStar(require("./translations"), exports);
 __exportStar(require("./exerciseLocaleUtils"), exports);
 __exportStar(require("./getVolumeComparison"), exports);
-__exportStar(require("./geography"), exports);
 const isWeightUnit = (x) => {
     return x === 'kg' || x === 'lbs';
 };

package/built/tests/testUtils.js

@@ -162,6 +162,7 @@ class WorkoutBuilder {
             },
             clientId: '',
             gymId: undefined,
+            isHomeGym: false,
         });
         this._exercises = [];
     }

package/built/workout/index.d.ts

@@ -11,7 +11,7 @@ export interface WorkoutSync {
     isMore: boolean;
     updated_at?: string;
 }
-export type Workout = OwnedWorkout | UserWorkout;
-export type WorkoutExercise = OwnedWorkoutExercise | UserWorkoutExercise;
-export type WorkoutExerciseSet = OwnedWorkoutExerciseSet | UserWorkoutExerciseSet;
+export type Workout = OwnedWorkout & Partial<UserWorkout>;
+export type WorkoutExercise = OwnedWorkoutExercise & Partial<UserWorkoutExercise>;
+export type WorkoutExerciseSet = OwnedWorkoutExerciseSet & Partial<UserWorkoutExerciseSet>;
 export declare function isOwnedWorkout(workout: OwnedWorkout | UserWorkout): workout is OwnedWorkout;

package/built/workout/index.js

@@ -20,7 +20,8 @@ __exportStar(require("./userWorkout"), exports);
 __exportStar(require("./publicWorkout"), exports);
 __exportStar(require("./normalizedWorkout"), exports);
 __exportStar(require("./postWorkoutRequest"), exports);
-// Placeholder, will be done better but this works for now
+// Stub
 function isOwnedWorkout(workout) {
-    return 'gymId' in workout;
+    void workout;
+    return true;
 }

package/built/workout/normalizedWorkout.d.ts

@@ -37,6 +37,7 @@ export interface NormalizedWorkout {
     biometrics?: WorkoutBiometrics;
     trainerProgramId: string | undefined;
     gymId: string | undefined;
+    isHomeGym: boolean;
 }
 export interface NormalizedSet {
     index: number;

package/built/workout/postWorkoutRequest.d.ts

@@ -40,6 +40,7 @@ export interface PostWorkoutRequestWorkout {
     is_biometrics_public: boolean;
     trainer_program_id: string | undefined;
     gym_id: string | undefined;
+    is_home_gym: boolean;
 }
 export interface PostWorkoutRequestExercise {
     title: string;

package/built/workout/publicWorkout.d.ts

@@ -1,4 +1,4 @@
-import { DistanceUnit, ExerciseType, MuscleGroup, RPE, SetPersonalRecordType, SetType, WeightUnit } from '..';
+import { DistanceUnit, Equipment, ExerciseType, MuscleGroup, RPE, SetPersonalRecordType, SetType, WeightUnit } from '..';
 export declare const isPublicWorkout: (x: any) => x is PublicWorkout;
 export interface PublicWorkout {
     type: 'public';
@@ -39,9 +39,11 @@ export interface PublicWorkoutExercise {
     superset_id: number | null;
     rest_seconds: number | null;
     notes: string;
+    priority: number;
     muscle_group: MuscleGroup;
     other_muscles: MuscleGroup[];
     exercise_type: ExerciseType;
+    equipment_category: Equipment;
     url?: string;
     media_type?: string;
     custom_exercise_image_url?: string | null;

package/built/workout/userWorkout.d.ts

@@ -1,4 +1,4 @@
-import { ExerciseType, MuscleGroup, PreviewWorkoutLike, RPE, SetPersonalRecordType, SetType, WorkoutBiometrics, WorkoutComment, WorkoutMedia } from '..';
+import { Equipment, ExerciseType, MuscleGroup, PreviewWorkoutLike, RPE, SetPersonalRecordType, SetType, WorkoutBiometrics, WorkoutComment, WorkoutMedia } from '..';
 export interface UserWorkout {
     id: string;
     short_id: string | null;
@@ -6,9 +6,13 @@ export interface UserWorkout {
     name: string;
     description?: string;
     like_count: number;
+    /** @deprecated 2.3.4 */
+    like_images: string[];
     preview_workout_likes: PreviewWorkoutLike[];
     comment_count: number;
     comments: WorkoutComment[];
+    /** @deprecated 1.28.13 */
+    image_urls?: string[];
     media: WorkoutMedia[];
     is_liked_by_user: boolean;
     start_time: number;
@@ -21,6 +25,7 @@ export interface UserWorkout {
     apple_watch: boolean;
     wearos_watch: boolean;
     verified: boolean;
+    created_at: string;
     updated_at: string;
     nth_workout: number;
     /**
@@ -34,8 +39,13 @@ export interface UserWorkout {
      */
     include_warmup_sets: boolean;
     is_private: boolean;
+    /**
+     * If applicable, the user ID of the coach who logged this workout
+     */
+    logged_by_coach_id?: string;
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
+    trainer_program_id: string | undefined;
     gym: UserWorkoutGym | undefined;
 }
 export interface UserWorkoutExercise {
@@ -56,10 +66,17 @@ export interface UserWorkoutExercise {
     superset_id: number | null;
     rest_seconds: number | null;
     notes: string;
+    priority: number;
     muscle_group: MuscleGroup;
     other_muscles: MuscleGroup[];
     exercise_type: ExerciseType;
+    equipment_category: Equipment;
+    url?: string;
+    media_type?: string;
+    custom_exercise_image_url?: string | null;
     thumbnail_url?: string | null;
+    manual_tag?: string;
+    aka?: string;
     /**
      * for exercises with two dumbbells
      *
@@ -85,6 +102,16 @@ export interface UserWorkoutExerciseSet {
     duration_seconds?: number | null;
     custom_metric?: number | null;
     rpe?: RPE | null;
+    /**
+     * @deprecated 1.29.17 -
+     * we can only set this to `best_weight`, `best_reps`, `best_duration` or
+     * `best_distance`. sending anything else would cause older clients to crash.
+     * newer clients will ignore this field and use the `prs` field instead.
+     */
+    personalRecords?: Array<{
+        type: 'best_weight' | 'best_reps' | 'best_duration' | 'best_distance';
+        value: number;
+    }>;
     prs: {
         type: SetPersonalRecordType;
         value: number;
@@ -96,8 +123,5 @@ type CommercialGym = {
     name: string;
     city: string;
 };
-type HomeGym = {
-    type: 'home';
-};
-export type UserWorkoutGym = CommercialGym | HomeGym;
+export type UserWorkoutGym = CommercialGym;
 export {};

package/built/workout/workout.d.ts

@@ -1,4 +1,4 @@
-import { ExerciseType, MuscleGroup, PreviewWorkoutLike, RPE, SetPersonalRecordType, SetType, WorkoutBiometrics, WorkoutComment, WorkoutMedia } from '..';
+import { Equipment, ExerciseType, MuscleGroup, PreviewWorkoutLike, RPE, SetPersonalRecordType, SetType, WorkoutBiometrics, WorkoutComment, WorkoutMedia } from '..';
 export interface OwnedWorkout {
     id: string;
     short_id: string | null;
@@ -6,9 +6,13 @@ export interface OwnedWorkout {
     name: string;
     description?: string;
     like_count: number;
+    /** @deprecated 2.3.4 */
+    like_images: string[];
     preview_workout_likes: PreviewWorkoutLike[];
     comment_count: number;
     comments: WorkoutComment[];
+    /** @deprecated 1.28.13 */
+    image_urls?: string[];
     media: WorkoutMedia[];
     is_liked_by_user: boolean;
     start_time: number;
@@ -24,11 +28,26 @@ export interface OwnedWorkout {
     created_at: string;
     updated_at: string;
     nth_workout: number;
+    /**
+     * See https://github.com/hevyapp/hevy-backend/pull/193 to understand
+     * why we added estimated_volume_kg
+     */
+    estimated_volume_kg: number;
+    /**
+     * Whether to include warmup sets in various calculations.
+     * https://github.com/hevyapp/hevy-shared/pull/312
+     */
+    include_warmup_sets: boolean;
     is_private: boolean;
+    /**
+     * If applicable, the user ID of the coach who logged this workout
+     */
+    logged_by_coach_id?: string;
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
     trainer_program_id: string | undefined;
     gym_id: string | undefined;
+    is_home_gym: boolean;
 }
 export interface TrainerWorkout extends OwnedWorkout {
     trainer_program_id: string;
@@ -51,10 +70,17 @@ export interface OwnedWorkoutExercise {
     superset_id: number | null;
     rest_seconds: number | null;
     notes: string;
+    priority: number;
     muscle_group: MuscleGroup;
     other_muscles: MuscleGroup[];
     exercise_type: ExerciseType;
+    equipment_category: Equipment;
+    url?: string;
+    media_type?: string;
+    custom_exercise_image_url?: string | null;
     thumbnail_url?: string | null;
+    manual_tag?: string;
+    aka?: string;
     /**
      * for exercises with two dumbbells
      *
@@ -80,6 +106,16 @@ export interface OwnedWorkoutExerciseSet {
     duration_seconds?: number | null;
     custom_metric?: number | null;
     rpe?: RPE | null;
+    /**
+     * @deprecated 1.29.17 -
+     * we can only set this to `best_weight`, `best_reps`, `best_duration` or
+     * `best_distance`. sending anything else would cause older clients to crash.
+     * newer clients will ignore this field and use the `prs` field instead.
+     */
+    personalRecords?: Array<{
+        type: 'best_weight' | 'best_reps' | 'best_duration' | 'best_distance';
+        value: number;
+    }>;
     prs: {
         type: SetPersonalRecordType;
         value: number;

package/package.json

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

package/built/geography.d.ts

@@ -1 +0,0 @@
-export declare const distanceMBetween: (lat1: number, lon1: number, lat2: number, lon2: number) => number;

package/built/geography.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.distanceMBetween = void 0;
-const haversineDistance = (lat1, lon1, lat2, lon2) => {
-    const R = 6371;
-    const dLat = ((lat2 - lat1) * Math.PI) / 180;
-    const dLon = ((lon2 - lon1) * Math.PI) / 180;
-    const a = Math.sin(dLat / 2) ** 2 +
-        Math.cos((lat1 * Math.PI) / 180) *
-            Math.cos((lat2 * Math.PI) / 180) *
-            Math.sin(dLon / 2) ** 2;
-    return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-};
-const distanceMBetween = (lat1, lon1, lat2, lon2) => Math.round(haversineDistance(lat1, lon1, lat2, lon2) * 1000);
-exports.distanceMBetween = distanceMBetween;

package/built/tests/geography.test.d.ts

@@ -1 +0,0 @@
-export {};

package/built/tests/geography.test.js

@@ -1,25 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const geography_1 = require("../geography");
-describe('Geography utils', () => {
-    describe('distanceMBetween', () => {
-        it('Calculates the distance between two sets of coordinates', () => __awaiter(void 0, void 0, void 0, function* () {
-            expect((0, geography_1.distanceMBetween)(51.001, 52, 51, 52)).toBe(111);
-            expect((0, geography_1.distanceMBetween)(51.002, 52, 51, 52)).toBe(222);
-            expect((0, geography_1.distanceMBetween)(50.999, 52, 51, 52)).toBe(111);
-            expect((0, geography_1.distanceMBetween)(51.01, 52, 51, 52)).toBe(1112);
-            expect((0, geography_1.distanceMBetween)(51.04, 52, 51, 52)).toBe(4448);
-            expect((0, geography_1.distanceMBetween)(51.035, 52.035, 51, 52)).toBe(4598);
-            expect((0, geography_1.distanceMBetween)(50.965, 51.965, 51, 52)).toBe(4599);
-        }));
-    });
-});