hevy-shared 1.0.1015 → 1.0.1017

package/built/index.d.ts

@@ -2,7 +2,7 @@ import { InstructionsLanguage } from './exerciseLocaleUtils';
 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';
 export * from './schemas';
 export * from './constants';
@@ -888,7 +888,7 @@ export interface Workout {
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
     trainer_program_id: string | undefined;
-    gym: TODO<Gym> | undefined;
+    gym: Gym | undefined;
 }
 export interface CustomExerciseImage {
     type: 'image';
@@ -968,7 +968,7 @@ export interface PostWorkoutRequestWorkout {
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
     trainer_program_id: string | undefined;
-    gym: TODO<Gym> | undefined;
+    gym: WorkoutGym | undefined;
 }
 export type WorkoutDataImporterReport = {
     state: 'idle';
@@ -1306,23 +1306,22 @@ export interface UpdateHevyTrainerProgramRequestBody {
     program: {
         version: 1;
         programId: string;
-        title: string | null;
-        level: TrainingLevel | null;
-        goal: TrainingGoal | null;
-        equipments: GranularEquipment[] | null;
-        weekly_frequency: WeeklyTrainingFrequency | null;
-        focus_muscle: SimplifiedMuscleGroup | null;
-        next_workout_index: number | null;
-        workout_duration_minutes: WorkoutDurationMinutes | null;
-        rest_timer_length: RestTimerLength | null;
-        cardio_preference: CardioPreference | null;
+        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;
         routines: {
             id: string;
             title: string;
             notes: string | null;
             exercises: RoutineUpdateExercise[];
-            index: number;
-        }[] | null;
+        }[];
     };
 }
 /** @deprecated Use HevyTrainerProgram instead */
@@ -1634,6 +1633,15 @@ export type HomeGym = {
     type: 'home';
 };
 export type Gym = CommercialGym | HomeGym;
+export type GymType = Gym['type'];
+export type WorkoutCommercialGym = {
+    type: 'commercial';
+    id: string;
+};
+export type WorkoutHomeGym = {
+    type: 'home';
+};
+export type WorkoutGym = WorkoutCommercialGym | WorkoutHomeGym;
 export interface StripePrice {
     product_id: string;
     billing_period: 'month' | 'year' | 'pay-once';

package/built/normalizedWorkoutUtils.d.ts

@@ -1,4 +1,4 @@
-import { ExerciseType, Gym, RPE, SetType, ShareToPlatform, TODO, WorkoutBiometrics, WorkoutMedia, WorkoutVisibility } from '.';
+import { ExerciseType, Gym, RPE, SetType, ShareToPlatform, WorkoutBiometrics, WorkoutMedia, WorkoutVisibility } from '.';
 /**
  * Events are used to determine the start time, end time and duration of a
  * `NormalizedWorkout`, in a way that can be persisted to disk.
@@ -36,7 +36,7 @@ export interface NormalizedWorkout {
     clientId: string;
     biometrics?: WorkoutBiometrics;
     trainerProgramId: string | undefined;
-    gym: TODO<Gym> | undefined;
+    gym: Gym | undefined;
 }
 export interface NormalizedSet {
     index: number;

package/built/typeUtils.d.ts

@@ -68,9 +68,3 @@ export declare const parseJSON: (...args: Parameters<typeof JSON.parse>) => unkn
  */
 export declare const typeSafeIndex: <T>(array: T[], index: number) => T | undefined;
 export declare const TODO: (message?: string) => never;
-/**
- * @deprecated Placeholder for avoiding cross-repo type issues due to merges.
- * Meant to be replaced with the enclosed type T as the earliest possible dev
- * convenience. DO NOT USE THIS IN PRODUCTION!
- */
-export type TODO<T> = T & never;

package/package.json

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