hevy-shared 1.0.1018 → 1.0.1020

package/built/index.d.ts

@@ -1,13 +1,15 @@
 import { InstructionsLanguage } from './exerciseLocaleUtils';
-import { TrainerWorkoutTemplateName, WorkoutDurationMinutes } from './hevyTrainer';
+import { WorkoutDurationMinutes } from './hevyTrainer';
 import { BugReportQuestionSchema, CreateBugReportRequestBodySchema, postEmailBackofficeSchema } from './schemas';
 import { Language } from './translations';
-import { Lookup, TODO } from './typeUtils';
+import { Lookup } from './typeUtils';
 import { z } from 'zod';
+import { UserWorkout } from './workout';
 export * from './schemas';
 export * from './constants';
 export * from './utils';
 export * from './units';
+export * from './workout';
 export * from './filterExercises';
 export * from './setIndicatorUtils';
 export * from './workoutVolume';
@@ -18,7 +20,6 @@ export * from './cue';
 export * from './muscleHeatmaps';
 export * from './muscleSplits';
 export * from './notifications';
-export * from './normalizedWorkoutUtils';
 export * from './routineUtils';
 export * from './typeUtils';
 export * from './async';
@@ -300,7 +301,7 @@ export interface BackofficeExistingUserResponse {
     public_api_key: string | null;
     limited_discovery: boolean;
     coach_trial_expire_date?: string;
-    hevy_trainer_program: TrainerProgramV3 | null;
+    hevy_trainer_program: HevyTrainerProgram | null;
 }
 export interface BackofficeDeletedUserResponse {
     state: 'deleted-account';
@@ -599,7 +600,7 @@ export interface PublicUserProfile {
     following_count: number;
     routines: RoutineMetadata[];
     weekly_workout_durations: WeeklyWorkoutDuration[];
-    last_workout?: Workout;
+    last_workout?: UserWorkout;
 }
 export declare const coreMuscles: readonly ["abdominals"];
 export declare const shoulderMuscles: readonly ["shoulders"];
@@ -745,80 +746,6 @@ export interface RepRange {
     start: number | null;
     end: number | null;
 }
-export interface StrictRepRange extends RepRange {
-    start: number;
-    end: number;
-}
-export interface WorkoutExerciseSet {
-    /**
-     * id can be a string or a number because we used
-     * to store it as int4 and now we store it as int8
-     * which is too big to store (accurately) in a JS
-     * number.
-     */
-    id: number | string;
-    index: number;
-    indicator: SetType;
-    weight_kg?: number | null;
-    reps?: number | null;
-    distance_meters?: number | null;
-    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;
-    }[];
-    completed_at: string | null;
-}
-export interface WorkoutExercise {
-    id: string;
-    exercise_template_id: string;
-    title: string;
-    es_title?: string | null;
-    de_title?: string | null;
-    fr_title?: string | null;
-    it_title?: string | null;
-    pt_title?: string | null;
-    ko_title?: string | null;
-    ja_title?: string | null;
-    tr_title?: string | null;
-    ru_title?: string | null;
-    zh_cn_title?: string | null;
-    zh_tw_title?: string | null;
-    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
-     *
-     * `true` if the weight of each set is the weight of _one_ dumbbell, but the
-     * exercise was performed with _two_ dumbbells of that weight
-     */
-    volume_doubling_enabled: boolean;
-    sets: WorkoutExerciseSet[];
-}
 export interface WorkoutComment {
     id: number;
     username: string;
@@ -845,56 +772,6 @@ export type PreviewWorkoutLike = {
     username: string;
     profile_pic: string;
 };
-export interface Workout {
-    id: string;
-    short_id: string | null;
-    index: number;
-    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;
-    end_time: number;
-    user_id: string;
-    username: string;
-    profile_image: string;
-    exercises: WorkoutExercise[];
-    routine_id?: string;
-    apple_watch: boolean;
-    wearos_watch: boolean;
-    verified: boolean;
-    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: TODO<Gym> | undefined;
-    trainer_workout_template_id: string | undefined;
-}
 export interface CustomExerciseImage {
     type: 'image';
     image_url: string;
@@ -905,77 +782,6 @@ export interface CustomExerciseVideo {
     video_preview_image_url: string;
 }
 export type CustomExerciseMedia = CustomExerciseImage | CustomExerciseVideo;
-export declare const isPublicWorkout: (x: any) => x is PublicWorkout;
-export interface PublicWorkout {
-    type: 'public';
-    id: string;
-    short_id: string | null;
-    name: string;
-    create_at: string;
-    start_time: number;
-    end_time: number;
-    username: string;
-    profile_image: string | null;
-    preview_image: string | null;
-    is_private: boolean;
-    exercises: WorkoutExercise[];
-    /**
-     * weight_unit and distance_unit are the current unit
-     * preferences of the owner of the workout.
-     */
-    weight_unit: WeightUnit;
-    distance_unit: DistanceUnit;
-    estimated_volume_kg: number;
-}
-export interface WorkoutSync {
-    updated: Workout[];
-    deleted: string[];
-    isMore: boolean;
-    updated_at?: string;
-}
-export interface PostWorkoutRequest {
-    workout: PostWorkoutRequestWorkout;
-    /**
-     * `source` is set by import-workout-data (currently only supports imports from Strong)
-     * and for workouts that come from the public API.
-     * This prop gives us visibility into workouts that aren't logged within Hevy. Currently,
-     * it's used to filter the feed so users aren't spammed by workouts created programmatically.
-     */
-    source?: 'strong' | 'public-api';
-    share_to_strava?: boolean;
-    /**
-     * Fake UTC format (ISO string of user's _local_ time, but with 'Z' as the
-     * time zone), since that is what Strava expects. 🤦‍♂️
-     * https://developers.strava.com/docs/reference/#api-Activities-createActivity
-     */
-    strava_activity_local_time?: string;
-}
-export interface PostClientsWorkoutRequest {
-    workout: PostWorkoutRequestWorkout;
-    updateRoutineValues: boolean;
-}
-/**
- * PostWorkoutRequestWorkout describes the final state of a completed workout.
- * It's used when sending a workout to the server.
- */
-export interface PostWorkoutRequestWorkout {
-    title: string;
-    description: string;
-    media: WorkoutMedia[];
-    start_time: number;
-    end_time: number;
-    exercises: PostWorkoutRequestExercise[];
-    routine_id?: string;
-    apple_watch: boolean;
-    wearos_watch: boolean;
-    workout_id: string;
-    is_private: boolean;
-    biometrics?: WorkoutBiometrics;
-    is_biometrics_public: boolean;
-    trainer_program_id: string | undefined;
-    gym: TODO<Gym> | undefined;
-    trainer_workout_template_id: string | undefined;
-}
 export type WorkoutDataImporterReport = {
     state: 'idle';
 } | {
@@ -1000,40 +806,6 @@ export interface HeartRateSample {
     timestamp_ms: number;
     bpm: number;
 }
-export interface PostWorkoutRequestExercise {
-    title: string;
-    exercise_template_id: string;
-    superset_id?: number;
-    rest_timer_seconds?: number;
-    notes: string;
-    /**
-     * for exercises with two dumbbells
-     *
-     * `true` if the weight of each set is the weight of _one_ dumbbell, but the
-     * exercise was performed with _two_ dumbbells of that weight
-     */
-    volume_doubling_enabled?: boolean;
-    sets: PostWorkoutRequestSet[];
-}
-export interface PostWorkoutRequestSet {
-    index: number;
-    type: SetType;
-    weight_kg?: number;
-    reps?: number;
-    distance_meters?: number;
-    duration_seconds?: number;
-    custom_metric?: number;
-    rpe?: RPE;
-    completed_at?: string;
-}
-/**
- * Used to update an existing workout. Props that are defined will be used to
- * update the corresponding values of the workout in the database, and those
- * that are undefined will not be changed.
- */
-export type UpdateWorkoutRequestWorkout = Partial<Pick<PostWorkoutRequestWorkout, 'title' | 'description' | 'media' | 'exercises' | 'is_private' | 'is_biometrics_public'>> & {
-    start_and_end_time?: Required<Pick<PostWorkoutRequestWorkout, 'start_time' | 'end_time'>>;
-};
 /** Routines */
 export interface RoutineSet {
     index: number;
@@ -1102,14 +874,12 @@ export interface Routine extends BaseRoutine {
     username: string;
     coach_id: null;
 }
-/** @deprecated Use TrainerWorkoutTemplate instead */
 export interface HevyTrainerRoutine extends Routine {
     hevy_trainer_program_id: string;
     program_id: null;
     coach_force_rpe_enabled: false;
     folder_id: null;
 }
-/** @deprecated Use TrainerWorkoutTemplate instead */
 export declare const isHevyTrainerRoutine: (routine: BaseRoutine) => routine is HevyTrainerRoutine;
 export type CoachsShallowLibraryRoutine = Omit<BaseRoutine, 'exercises' | 'profile_pic' | 'hevy_trainer_program_id' | 'username'>;
 export interface CoachesRoutine extends BaseRoutine {
@@ -1278,97 +1048,6 @@ export interface GetTeamInviteResponse {
 export interface OutstandingInvitesForCoachTeamResponse {
     invites: CoachTeamInvite[];
 }
-export interface TrainerWorkoutTemplateResistanceExercise {
-    kind: 'resistance';
-    id: string;
-    exercise_template_id: string;
-    index: number;
-    set_count: number;
-    warmup_set_count: number;
-    rep_range: StrictRepRange;
-    rest_seconds: number;
-}
-export interface TrainerWorkoutTemplateCardioExercise {
-    kind: 'cardio';
-    id: string;
-    exercise_template_id: string;
-    index: number;
-    set_count: 1;
-    duration_seconds: number;
-}
-export interface TrainerWorkoutTemplateOtherExercise {
-    kind: 'other';
-    id: string;
-    exercise_template_id: string;
-    index: number;
-    set_count: number;
-}
-export type TrainerWorkoutTemplateExercise = TrainerWorkoutTemplateResistanceExercise | TrainerWorkoutTemplateCardioExercise | TrainerWorkoutTemplateOtherExercise;
-export interface TrainerWorkoutTemplate {
-    id: string;
-    hevy_trainer_program_id: string;
-    index: number;
-    name: TrainerWorkoutTemplateName;
-    exercises: TrainerWorkoutTemplateExercise[];
-}
-export interface TrainerProgramV3 {
-    id: string;
-    schema_version: 'v3';
-    created_at: string;
-    updated_at: string;
-    level: TrainingLevel;
-    goal: TrainingGoal;
-    equipments: GranularEquipment[];
-    weekly_frequency: WeeklyTrainingFrequency;
-    templates: TrainerWorkoutTemplate[];
-    focus_muscle?: SimplifiedMuscleGroup;
-    next_workout_index: number;
-    workout_duration_minutes: WorkoutDurationMinutes;
-    rest_timer_length: RestTimerLength;
-    cardio_preference: CardioPreference;
-}
-export type TrainerWorkoutTemplateExerciseInput = Omit<TrainerWorkoutTemplateResistanceExercise, 'id'> | Omit<TrainerWorkoutTemplateCardioExercise, 'id'> | Omit<TrainerWorkoutTemplateOtherExercise, 'id'>;
-export interface PostTrainerWorkoutTemplate {
-    name: TrainerWorkoutTemplateName;
-    index: number;
-    exercises: TrainerWorkoutTemplateExerciseInput[];
-}
-export interface UpdateTrainerWorkoutTemplate extends PostTrainerWorkoutTemplate {
-    id: string;
-}
-export interface PostTrainerProgramV3RequestBody {
-    program: {
-        version: 3;
-        title: string;
-        level: TrainingLevel;
-        goal: TrainingGoal;
-        equipments: GranularEquipment[];
-        weekly_frequency: WeeklyTrainingFrequency;
-        focus_muscle?: SimplifiedMuscleGroup;
-        next_workout_index?: number;
-        workout_duration_minutes: WorkoutDurationMinutes;
-        rest_timer_length: RestTimerLength;
-        cardio_preference: CardioPreference;
-        templates: PostTrainerWorkoutTemplate[];
-    };
-}
-export interface UpdateTrainerProgramV3RequestBody {
-    program: {
-        version: 3;
-        programId: string;
-        level: TrainingLevel;
-        goal: TrainingGoal;
-        equipments: GranularEquipment[];
-        weekly_frequency: WeeklyTrainingFrequency;
-        focus_muscle?: SimplifiedMuscleGroup;
-        next_workout_index?: number;
-        workout_duration_minutes: WorkoutDurationMinutes;
-        rest_timer_length: RestTimerLength;
-        cardio_preference: CardioPreference;
-        templates: UpdateTrainerWorkoutTemplate[];
-    };
-}
-/** @deprecated Use TrainerProgramV3 instead */
 export interface HevyTrainerProgram {
     id: string;
     created_at: string;
@@ -1385,7 +1064,6 @@ export interface HevyTrainerProgram {
     rest_timer_length: RestTimerLength;
     cardio_preference: CardioPreference;
 }
-/** @deprecated Use PostTrainerProgramV3RequestBody instead */
 export interface PostHevyTrainerProgramRequestBody {
     program: {
         version: 1;
@@ -1402,7 +1080,6 @@ export interface PostHevyTrainerProgramRequestBody {
         cardio_preference: CardioPreference;
     };
 }
-/** @deprecated Use UpdateTrainerProgramV3RequestBody instead */
 export interface UpdateHevyTrainerProgramRequestBody {
     program: {
         version: 1;
@@ -1425,7 +1102,7 @@ export interface UpdateHevyTrainerProgramRequestBody {
         }[];
     };
 }
-/** @deprecated Use TrainerProgramV3 instead */
+/** @deprecated Use HevyTrainerProgram instead */
 export interface HevyTrainerProgramOld {
     id: string;
     created_at: string;
@@ -1440,7 +1117,7 @@ export interface HevyTrainerProgramOld {
     next_workout_index: number;
     workout_duration_minutes?: WorkoutDurationMinutes;
 }
-/** @deprecated Use PostTrainerProgramV3RequestBody instead */
+/** @deprecated Use PostHevyTrainerProgramRequestBody instead */
 export interface PostHevyTrainerProgramOldRequestBody {
     program: {
         title: string;
@@ -1454,7 +1131,7 @@ export interface PostHevyTrainerProgramOldRequestBody {
         workout_duration_minutes?: WorkoutDurationMinutes;
     };
 }
-/** @deprecated Use UpdateTrainerProgramV3RequestBody instead */
+/** @deprecated Use UpdateHevyTrainerProgramRequestBody instead */
 export interface UpdateHevyTrainerProgramOldRequestBody {
     program: {
         programId: string;
@@ -1728,7 +1405,8 @@ export type CommercialGym = {
     name: string;
     fullAddress: string;
     city: string;
-    distanceM: number;
+    latitude: number;
+    longitude: number;
 };
 export type HomeGym = {
     type: 'home';

package/built/index.js

@@ -14,13 +14,14 @@ 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.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.weeklyTrainingFrequencies = exports.isGranularEquipment = exports.granularEquipments = exports.hevyTrainerProgramEquipments = exports.cardioPreferences = exports.restTimerLengths = 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.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.parseClientAuthTokenResponse = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = void 0;
-exports.isOAuthScope = exports.supportedScopes = exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = exports.isHeartRateSamples = void 0;
+exports.isHeartRateSamples = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.weeklyTrainingFrequencies = exports.isGranularEquipment = exports.granularEquipments = exports.hevyTrainerProgramEquipments = exports.cardioPreferences = exports.restTimerLengths = 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.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.parseClientAuthTokenResponse = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = void 0;
+exports.isOAuthScope = exports.supportedScopes = exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = void 0;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./schemas"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./units"), exports);
+__exportStar(require("./workout"), exports);
 __exportStar(require("./filterExercises"), exports);
 __exportStar(require("./setIndicatorUtils"), exports);
 __exportStar(require("./workoutVolume"), exports);
@@ -31,7 +32,6 @@ __exportStar(require("./cue"), exports);
 __exportStar(require("./muscleHeatmaps"), exports);
 __exportStar(require("./muscleSplits"), exports);
 __exportStar(require("./notifications"), exports);
-__exportStar(require("./normalizedWorkoutUtils"), exports);
 __exportStar(require("./routineUtils"), exports);
 __exportStar(require("./typeUtils"), exports);
 __exportStar(require("./async"), exports);
@@ -296,10 +296,6 @@ exports.isRPE = isRPE;
 const _setTypes = ['warmup', 'normal', 'failure', 'dropset'];
 const isSetType = (x) => (0, typeUtils_1.isInArray)(x, _setTypes);
 exports.isSetType = isSetType;
-const isPublicWorkout = (x) => {
-    return x.type === 'public';
-};
-exports.isPublicWorkout = isPublicWorkout;
 const isHeartRateSamples = (x) => {
     if (!x || !Array.isArray(x))
         return false;
@@ -324,7 +320,6 @@ const isWorkoutBiometrics = (x) => {
     return caloriesAreValid && heartSamplesAreValid;
 };
 exports.isWorkoutBiometrics = isWorkoutBiometrics;
-/** @deprecated Use TrainerWorkoutTemplate instead */
 const isHevyTrainerRoutine = (routine) => routine.hevy_trainer_program_id !== null;
 exports.isHevyTrainerRoutine = isHevyTrainerRoutine;
 exports.measurementsList = [

package/built/routineUtils.d.ts

@@ -1,5 +1,4 @@
-import { BaseRoutine, HevyTrainerRoutine, RoutineUpdate } from '.';
-import { NormalizedWorkout } from './normalizedWorkoutUtils';
+import { BaseRoutine, HevyTrainerRoutine, NormalizedWorkout, RoutineUpdate } from '.';
 export declare const majorRoutineUpdate: (routine: BaseRoutine, workout: NormalizedWorkout) => RoutineUpdate;
 export declare const minorRoutineUpdate: (routine: BaseRoutine, workout: NormalizedWorkout) => RoutineUpdate;
 /**