hevy-shared 1.0.832 → 1.0.833

package/built/API/APIClient.d.ts

@@ -82,12 +82,11 @@ export declare class HevyAPIClient {
     private static readonly DEFAULT_REFRESH_AUTH_TOKEN_API_ENDPOINT;
     private readonly _config;
     private _errorHandlers;
-    private _authTokenFactory;
+    private _authToken;
     private _legacyAuthToken;
     private _httpClient;
     private _lastTokenRefresh;
     constructor(httpClient: HTTPClient, config: HevyAPIClientConfig);
-    private get _authToken();
     private get _authHeaders();
     private _addAuthHeaders;
     private refreshExpiredAuthToken;
@@ -102,14 +101,10 @@ export declare class HevyAPIClient {
         readonly method: "post";
         readonly url: string;
     };
-    setAuthToken(newAuthToken: {
-        authToken: DeepReadonly<ClientAuthToken> | null;
+    setAuthToken(newAuthToken: DeepReadonly<{
+        authToken: ClientAuthToken | null;
         legacyAuthToken: string | null;
-    }): Promise<void>;
-    setAuthToken(newAuthToken: {
-        getAuthToken: () => ClientAuthToken | null;
-        legacyAuthToken: string | null;
-    }): Promise<void>;
+    }>): Promise<void>;
     clearAuthToken(): Promise<void>;
     attachErrorHandler(onError: HTTPErrorHandler<{
         willRetry: boolean;

package/built/API/APIClient.js

@@ -21,10 +21,7 @@ const types_1 = require("./types");
 class HevyAPIClient {
     constructor(httpClient, config) {
         this._errorHandlers = [];
-        this._authTokenFactory = {
-            type: 'value',
-            value: null,
-        };
+        this._authToken = null;
         this._legacyAuthToken = null;
         this._addAuthHeaders = (config) => (Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this._authHeaders) }));
         this._httpClient = httpClient;
@@ -39,18 +36,12 @@ class HevyAPIClient {
                 this[m] = this[m].bind(this);
         });
     }
-    get _authToken() {
-        switch (this._authTokenFactory.type) {
-            case 'value':
-                return this._authTokenFactory.value;
-            case 'getter':
-                return this._authTokenFactory.get();
-        }
-    }
     get _authHeaders() {
-        return Object.assign(Object.assign({}, (this._authToken
+        return this._authToken
             ? { authorization: `Bearer ${this._authToken.access_token}` }
-            : {})), (this._legacyAuthToken ? { 'auth-token': this._legacyAuthToken } : {}));
+            : this._legacyAuthToken
+                ? { 'auth-token': this._legacyAuthToken }
+                : null;
     }
     refreshExpiredAuthToken() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -127,9 +118,7 @@ class HevyAPIClient {
             if (newToken.expires_at.valueOf() < earliestAutoRefreshUnixMs) {
                 newToken.expires_at = new Date(earliestAutoRefreshUnixMs);
             }
-            if (this._authTokenFactory.type === 'value') {
-                this._authTokenFactory.value = newToken;
-            }
+            this._authToken = newToken;
             this._config.onNewAuthToken(newToken);
         });
     }
@@ -191,16 +180,14 @@ class HevyAPIClient {
     setAuthToken(newAuthToken) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.waitForTokenRefresh();
-            const { authToken, getAuthToken, legacyAuthToken } = newAuthToken;
-            if (getAuthToken !== undefined && authToken === undefined) {
-                this._authTokenFactory = { type: 'getter', get: getAuthToken };
-            }
-            else if (authToken !== undefined && getAuthToken === undefined) {
-                this._authTokenFactory = { type: 'value', value: authToken };
-            }
-            else {
-                throw new Error("Invalid arguments: exactly one of `authToken' or `getAuthToken' is required");
-            }
+            const { authToken, legacyAuthToken } = newAuthToken;
+            this._authToken = authToken
+                ? {
+                    access_token: authToken.access_token,
+                    refresh_token: authToken.refresh_token,
+                    expires_at: new Date(authToken.expires_at),
+                }
+                : null;
             this._legacyAuthToken = legacyAuthToken;
             this._lastTokenRefresh = undefined;
         });
@@ -208,7 +195,7 @@ class HevyAPIClient {
     clearAuthToken() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.waitForTokenRefresh();
-            this._authTokenFactory = { type: 'value', value: null };
+            this._authToken = null;
             this._legacyAuthToken = null;
             this._lastTokenRefresh = undefined;
         });

package/built/async.d.ts

@@ -38,9 +38,4 @@ type MethodDecorator<T> = (target: unknown, propertyKey: string | symbol, descri
 export declare function synchronized(queue: boolean): MethodDecorator<Promise<any>>;
 export declare function synchronized(queue: boolean, id: any): MethodDecorator<Promise<any>>;
 export declare function synchronized(target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>): void;
-export declare abstract class LockError extends Error {
-    abstract readonly propertyKey: string | symbol;
-    abstract readonly lockId: unknown;
-    protected constructor(...args: any);
-}
 export {};

package/built/async.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LockError = exports.handleRejection = exports.allToResolveOrReject = void 0;
+exports.handleRejection = exports.allToResolveOrReject = void 0;
 exports.synchronized = synchronized;
 /**
  * The difference between this and `Promise.all` is that `Promise.all` rejects
@@ -75,24 +75,7 @@ function synchronized(arg0, arg1, arg2) {
     }
 }
 const $queue = Symbol();
-class LockError extends Error {
-    constructor(...args) {
-        super(...args);
-    }
-}
-exports.LockError = LockError;
-class $LockError extends LockError {
-    constructor({ message: baseMessage, propertyKey, lockId, }) {
-        const formattedLockId = lockId !== undefined ? `"${String(lockId)}"` : '(anonymous)';
-        const message = `Cannot invoke "${String(propertyKey)}" (locked by ${formattedLockId}): ${baseMessage}`;
-        super(message);
-        this.name = 'LockError';
-        this.message = message;
-        this.propertyKey = propertyKey;
-        this.lockId = lockId;
-    }
-}
-function synchronizedDecoratorFactory(_target, propertyKey, descriptor, wait, id) {
+function synchronizedDecoratorFactory(_target, _propertyKey, descriptor, wait, id) {
     const origFn = descriptor.value;
     const lockId = arguments.length === 5 ? id : Symbol();
     descriptor.value = function (...args) {
@@ -101,11 +84,7 @@ function synchronizedDecoratorFactory(_target, propertyKey, descriptor, wait, id
             var _c;
             const queue = ((_b = (_c = ((_a = this[$queue]) !== null && _a !== void 0 ? _a : (this[$queue] = {})))[lockId]) !== null && _b !== void 0 ? _b : (_c[lockId] = []));
             if (queue.length > 0 && !wait) {
-                throw new $LockError({
-                    message: 'Operation is already in progress',
-                    propertyKey,
-                    lockId: id,
-                });
+                throw new Error('Operation is already in progress');
             }
             let done;
             const thisCall = new Promise((resolve) => {
@@ -121,11 +100,7 @@ function synchronizedDecoratorFactory(_target, propertyKey, descriptor, wait, id
                 done();
                 if (queue.shift() !== thisCall) {
                     // eslint-disable-next-line no-unsafe-finally
-                    throw new $LockError({
-                        message: 'Assertion failed: @synchronized queue is mangled',
-                        propertyKey,
-                        lockId: id,
-                    });
+                    throw new Error('Assertion failed: @synchronized queue is mangled');
                 }
             }
         });

package/built/index.d.ts

@@ -210,7 +210,7 @@ export interface GoogleSignUpRequest {
     source?: 'web';
     gympassUserId?: string;
 }
-export interface SocialLoginResult extends ClientAuthTokenResponse {
+export interface SocialLoginResult {
     auth_token: string;
     username: string;
     user_id: string;
@@ -230,7 +230,6 @@ export interface ClientAuthTokenResponse {
     refresh_token: string;
     expires_at: string;
 }
-export declare const parseClientAuthTokenResponse: (data: ClientAuthTokenResponse) => ClientAuthToken | null;
 export interface UsernameAvailabilityResponse {
     isAvailable: boolean;
     suggestions: string[];
@@ -321,11 +320,6 @@ export interface BackofficeAccountUpdate {
     /** `null` means we're unlinking the user's Gympass account */
     gympass_email?: string | null;
     gympass_subscription_active?: boolean;
-    gympass_account?: {
-        id: string;
-        email: string;
-        country_code?: string;
-    };
     limited_discovery?: boolean;
     delete_profile_pic?: boolean;
     delete_link?: boolean;
@@ -565,6 +559,9 @@ export interface UserProfile {
     weekly_workout_durations: WeeklyWorkoutDuration[];
     mutual_followers: PreviewMutualUser[];
 }
+export interface UserWorkoutStreakCount {
+    streak_count: number;
+}
 export interface PublicUserProfile {
     private_profile: boolean;
     username: string;
@@ -858,6 +855,7 @@ export interface Workout {
     logged_by_coach_id?: string;
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
+    is_trainer_workout: boolean;
     trainer_program_id: string | undefined;
 }
 export interface CustomExerciseImage {
@@ -937,6 +935,7 @@ export interface PostWorkoutRequestWorkout {
     is_private: boolean;
     biometrics?: WorkoutBiometrics;
     is_biometrics_public: boolean;
+    is_trainer_workout: boolean;
     trainer_program_id: string | undefined;
 }
 export declare const isHeartRateSamples: (x: any) => x is HeartRateSample[];
@@ -1254,25 +1253,6 @@ export interface PostHevyTrainerProgramRequestBody {
         workout_duration_minutes?: WorkoutDurationMinutes;
     };
 }
-export interface UpdateHevyTrainerProgramRequestBody {
-    program: {
-        programId: string;
-        title: string;
-        level: TrainingLevel;
-        goal: TrainingGoal;
-        equipments: HevyTrainerProgramEquipment[];
-        weekly_frequency: WeeklyTrainingFrequency;
-        focus_muscle?: SimplifiedMuscleGroup;
-        next_workout_index?: number;
-        workout_duration_minutes?: WorkoutDurationMinutes;
-        routines: {
-            id: string;
-            title: string;
-            notes: string | null;
-            exercises: RoutineUpdateExercise[];
-        }[];
-    };
-}
 export declare const measurementsList: readonly ["weight_kg", "lean_mass_kg", "fat_percent", "neck_cm", "shoulder_cm", "chest_cm", "left_bicep_cm", "right_bicep_cm", "left_forearm_cm", "right_forearm_cm", "abdomen", "waist", "hips", "left_thigh", "right_thigh", "left_calf", "right_calf"];
 type MeasurementProperties = {
     [key in typeof measurementsList[number]]?: number;

package/built/index.js

@@ -14,8 +14,8 @@ 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.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.weeklyTrainingFrequencies = exports.hevyTrainerProgramEquipments = 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 = exports.isLanguage = exports.supportedLanguages = void 0;
-exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = void 0;
+exports.isWorkoutBiometrics = exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.weeklyTrainingFrequencies = exports.hevyTrainerProgramEquipments = 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.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.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = void 0;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
@@ -94,22 +94,6 @@ exports.isErrorResponse = isErrorResponse;
 const _coachRoles = ['member', 'admin', 'owner'];
 const isCoachRole = (role) => (0, typeUtils_1.isInArray)(role, _coachRoles);
 exports.isCoachRole = isCoachRole;
-const parseClientAuthTokenResponse = (data) => typeof data === 'object' &&
-    !!data &&
-    typeof data.access_token === 'string' &&
-    data.access_token.length > 0 &&
-    typeof data.refresh_token === 'string' &&
-    data.refresh_token.length > 0 &&
-    typeof data.expires_at === 'string' &&
-    data.expires_at.length > 0 &&
-    !!new Date(data.expires_at).valueOf()
-    ? {
-        access_token: data.access_token,
-        refresh_token: data.refresh_token,
-        expires_at: new Date(data.expires_at),
-    }
-    : null;
-exports.parseClientAuthTokenResponse = parseClientAuthTokenResponse;
 exports.DefaultClientConfiguration = {
     is_chat_enabled: false,
     are_notifications_enabled: true,

package/built/normalizedWorkoutUtils.d.ts

@@ -35,6 +35,7 @@ export interface NormalizedWorkout {
     };
     clientId: string;
     biometrics?: WorkoutBiometrics;
+    isTrainerWorkout: boolean;
     trainerProgramId: string | undefined;
 }
 export interface NormalizedSet {

package/built/tests/testUtils.js

@@ -154,6 +154,7 @@ class WorkoutBuilder {
             wearosWatch: false,
             workoutVisibility: 'public',
             isWorkoutBiometricsPublic: true,
+            isTrainerWorkout: false,
             trainerProgramId: undefined,
             shareTo: {
                 strava: false,

package/package.json

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