hevy-shared 1.0.962 → 1.0.964

package/built/websocket.d.ts

@@ -1,3 +1,4 @@
+import { Program, BaseRoutine } from '.';
 import { NewMessageChatUpdate, MessageDeletedChatUpdate, NewConversationChatUpdate } from './chat';
 export interface PingChatUpdate {
     type: 'websocket-ping';
@@ -5,14 +6,25 @@ export interface PingChatUpdate {
 export interface PongChatUpdate {
     type: 'websocket-pong';
 }
-export interface CoachesClientsUpdated {
+export interface CoachClientsUpdated {
     type: 'coaches-clients-updated';
     new_client_ids: string[];
     removed_client_ids: string[];
 }
+export interface CoachProgramUpdated {
+    type: 'coaches-program-updated';
+    updated_program: Program;
+}
+export interface CoachRoutineUpdated {
+    type: 'coaches-routine-updated';
+    updated_routine: BaseRoutine;
+}
+export interface CoachExerciseLibraryUpdated {
+    type: 'coaches-exercise-library-updated';
+}
 export interface WebsocketMessageRequest {
     message: HevyWebsocketMessage;
     recipient_user_ids: string[];
 }
-export type HevyWebsocketMessage = NewMessageChatUpdate | MessageDeletedChatUpdate | NewConversationChatUpdate | PingChatUpdate | PongChatUpdate | CoachesClientsUpdated;
+export type HevyWebsocketMessage = NewMessageChatUpdate | MessageDeletedChatUpdate | NewConversationChatUpdate | PingChatUpdate | PongChatUpdate | CoachClientsUpdated | CoachProgramUpdated | CoachRoutineUpdated | CoachExerciseLibraryUpdated;
 export declare const isHevyWebsocketMessage: (message?: any) => message is HevyWebsocketMessage;

package/built/workoutVolume.d.ts

@@ -1,11 +1,29 @@
-import { BodyMeasurement, ExerciseType, Workout } from '.';
-export declare const is100PercentBodyWeightExercise: (exerciseTemplateId: string) => boolean;
+import { BodyMeasurement, ExerciseType, BaseExerciseTemplate, WorkoutExerciseSet } from '.';
+export declare const isVolumeDoublingSupportableForExerciseTemplate: (exerciseTemplate: Pick<BaseExerciseTemplate, "equipment_category" | "exercise_type">) => boolean;
+export interface VolumeCalculableWorkout {
+    exercises: {
+        exercise_type: ExerciseType;
+        exercise_template_id: string;
+        volume_doubling_enabled: boolean;
+        hundred_percent_bodyweight_exercise: boolean;
+        sets: Pick<WorkoutExerciseSet, 'indicator' | 'weight_kg' | 'reps' | 'distance_meters' | 'duration_seconds'>[];
+    }[];
+    include_warmup_sets: boolean;
+}
+export interface TimestampedVolumeCalculableWorkout extends VolumeCalculableWorkout {
+    start_time: number;
+}
 interface WorkoutVolumeKgProps {
-    workout: Workout;
-    measurements: BodyMeasurement[];
+    workout: TimestampedVolumeCalculableWorkout;
+    measurements: Pick<BodyMeasurement, 'date' | 'weight_kg'>[];
 }
 export type BodyWeightMeasurement = BodyMeasurement & Required<Pick<BodyMeasurement, 'weight_kg'>>;
 export declare const workoutVolumeKg: ({ workout, measurements, }: WorkoutVolumeKgProps) => number;
+interface EstimatedWorkoutVolumeKgProps {
+    workout: VolumeCalculableWorkout;
+    bodyweightKg: number;
+}
+export declare const estimatedWorkoutVolumeKg: ({ workout, bodyweightKg, }: EstimatedWorkoutVolumeKgProps) => number;
 /**
  * Given a date, this will return the nearest bodyweight value
  * that was logged before it.
@@ -15,13 +33,14 @@ export interface WorkoutVolumeSetsVolumeKgProps {
     bodyweightKg: number;
     sets: WorkoutVolumeSet[];
 }
-export declare const workoutVolumeSetsVolumeKg: ({ bodyweightKg, sets, }: WorkoutVolumeSetsVolumeKgProps) => number;
 export interface WorkoutVolumeSet {
     type: ExerciseType;
     exerciseTemplateId: string;
     weightKg: number;
     reps: number;
     distanceMeters: number;
+    volumeDoublingEnabled?: boolean;
+    hundredPercentBodyweightExercise: boolean;
 }
 export declare const setVolumeKg: (set: WorkoutVolumeSet, bodyweightKg: number) => number;
 export {};

package/built/workoutVolume.js

@@ -1,35 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setVolumeKg = exports.workoutVolumeSetsVolumeKg = exports.getClosestRelevantBodyWeightKgForDate = exports.workoutVolumeKg = exports.is100PercentBodyWeightExercise = void 0;
+exports.setVolumeKg = exports.getClosestRelevantBodyWeightKgForDate = exports.estimatedWorkoutVolumeKg = exports.workoutVolumeKg = exports.isVolumeDoublingSupportableForExerciseTemplate = void 0;
 const lodash_1 = require("lodash");
 const _1 = require(".");
-const is100PercentBodyWeightExercise = (exerciseTemplateId) => {
-    const exerciseTemplateIds = new Set([
-        '1B2B1E7C',
-        '729237D1',
-        '2C37EC5E',
-        '56808FD2',
-        'A91838C0',
-        'EE2938D1',
-        '7C50F118',
-        'C7AE420A',
-        '29083183',
-        '023943F1',
-        'D23C609B',
-        '28BB4A95',
-        '10347BAC',
-        '4B4BF8C2',
-        '6FCD7755',
-        '29472BE1',
-        'E9E4089F',
-        '51A0EDAA',
-        '9F9C164B',
-        '30F03BF0',
-        '90B04F96', // Handstand Push Up
-    ]);
-    return exerciseTemplateIds.has(exerciseTemplateId);
+const isVolumeDoublingSupportableForExerciseTemplate = (exerciseTemplate) => {
+    return (exerciseTemplate.equipment_category === 'dumbbell' &&
+        exerciseTemplate.exercise_type === 'weight_reps');
 };
-exports.is100PercentBodyWeightExercise = is100PercentBodyWeightExercise;
+exports.isVolumeDoublingSupportableForExerciseTemplate = isVolumeDoublingSupportableForExerciseTemplate;
 const workoutVolumeKg = ({ workout, measurements, }) => {
     var _a, _b;
     const workoutDate = new Date(workout.start_time * 1000);
@@ -45,12 +23,19 @@ const workoutVolumeKg = ({ workout, measurements, }) => {
      */
     const oldestLoggedMeasurement = (_b = (_a = bodyWeightMeasurements[0]) === null || _a === void 0 ? void 0 : _a.weight_kg) !== null && _b !== void 0 ? _b : 0;
     const bodyweightKg = mostRecentMeasurementBeforeWorkout !== null && mostRecentMeasurementBeforeWorkout !== void 0 ? mostRecentMeasurementBeforeWorkout : oldestLoggedMeasurement;
-    return (0, exports.workoutVolumeSetsVolumeKg)({
+    return workoutVolumeSetsVolumeKg({
         bodyweightKg,
         sets: workoutToWorkoutVolumeSets(workout),
     });
 };
 exports.workoutVolumeKg = workoutVolumeKg;
+const estimatedWorkoutVolumeKg = ({ workout, bodyweightKg, }) => {
+    return workoutVolumeSetsVolumeKg({
+        bodyweightKg,
+        sets: workoutToWorkoutVolumeSets(workout),
+    });
+};
+exports.estimatedWorkoutVolumeKg = estimatedWorkoutVolumeKg;
 /**
  * Given a date, this will return the nearest bodyweight value
  * that was logged before it.
@@ -65,15 +50,15 @@ const workoutVolumeSetsVolumeKg = ({ bodyweightKg, sets, }) => {
         return accu + (0, exports.setVolumeKg)(s, bodyweightKg);
     }, 0);
 };
-exports.workoutVolumeSetsVolumeKg = workoutVolumeSetsVolumeKg;
 const setVolumeKg = (set, bodyweightKg) => {
-    const { type, exerciseTemplateId, weightKg, reps, distanceMeters } = set;
+    const { type, weightKg: originalWeightKg, reps, distanceMeters, volumeDoublingEnabled, } = set;
+    const weightKg = originalWeightKg * (volumeDoublingEnabled ? 2 : 1);
     switch (type) {
         case 'weight_reps':
             // eg. Bench Press (Barbell)
             return weightKg * reps;
         case 'reps_only':
-            if ((0, exports.is100PercentBodyWeightExercise)(exerciseTemplateId)) {
+            if (set.hundredPercentBodyweightExercise) {
                 // eg. Pull Up
                 return bodyweightKg * reps;
             }
@@ -82,7 +67,7 @@ const setVolumeKg = (set, bodyweightKg) => {
                 return 0;
             }
         case 'bodyweight_reps':
-            if ((0, exports.is100PercentBodyWeightExercise)(exerciseTemplateId)) {
+            if (set.hundredPercentBodyweightExercise) {
                 // eg. Pull Up (Weighted)
                 return (weightKg + bodyweightKg) * reps;
             }
@@ -91,7 +76,7 @@ const setVolumeKg = (set, bodyweightKg) => {
                 return weightKg * reps;
             }
         case 'bodyweight_assisted_reps':
-            if ((0, exports.is100PercentBodyWeightExercise)(exerciseTemplateId)) {
+            if (set.hundredPercentBodyweightExercise) {
                 // eg. Pull Up (Assisted)
                 const bodyweightAssistedRepsVolume = (bodyweightKg - weightKg) * reps;
                 return Math.max(bodyweightAssistedRepsVolume, 0);
@@ -103,6 +88,8 @@ const setVolumeKg = (set, bodyweightKg) => {
         case 'short_distance_weight':
             // eg. Farmers Walk
             return distanceMeters * weightKg;
+        case 'weight_duration':
+            return weightKg;
         default:
             // `duration` and `distance_duration` exercises
             return 0;
@@ -111,7 +98,9 @@ const setVolumeKg = (set, bodyweightKg) => {
 exports.setVolumeKg = setVolumeKg;
 const workoutToWorkoutVolumeSets = (workout) => {
     const unflatSets = workout.exercises.map((e) => {
-        return e.sets.map((s) => {
+        return e.sets
+            .filter((s) => workout.include_warmup_sets || s.indicator !== 'warmup')
+            .map((s) => {
             var _a, _b, _c;
             return {
                 type: e.exercise_type || 'weight_reps',
@@ -119,6 +108,8 @@ const workoutToWorkoutVolumeSets = (workout) => {
                 weightKg: (_a = s.weight_kg) !== null && _a !== void 0 ? _a : 0,
                 reps: (_b = s.reps) !== null && _b !== void 0 ? _b : 0,
                 distanceMeters: (_c = s.distance_meters) !== null && _c !== void 0 ? _c : 0,
+                volumeDoublingEnabled: e.volume_doubling_enabled,
+                hundredPercentBodyweightExercise: e.hundred_percent_bodyweight_exercise,
             };
         });
     });

package/package.json

@@ -1,35 +1,56 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.962",
+  "version": "1.0.964",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
-  "prepare": "tsc",
   "prepublish": "tsc",
   "scripts": {
-    "build": "tsc",
+    "prepare": "tsc --skipLibCheck",
+    "build": "tsc --removeComments && tsc --emitDeclarationOnly",
     "types": "tsc --skipLibCheck",
     "p": "npm run test && npm version patch && npm run build && npm publish && git push",
+    "ci-build": "./scripts/publish.sh",
     "lint": "eslint . --ext .ts",
     "lint-fix": "eslint . --ext .ts --fix",
     "test": "jest"
   },
+  "exports": {
+    ".": "./built/index.js",
+    "./API": "./built/API/index.js",
+    "./translations": "./built/translations/index.js"
+  },
+  "typesVersions": {
+    "*": {
+      "API": [
+        "built/API/index.d.ts"
+      ],
+      "translations": [
+        "built/translations/index.d.ts"
+      ]
+    }
+  },
+  "files": [
+    "built"
+  ],
   "keywords": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.168",
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
-    "eslint": "^8.17.0",
+    "@typescript-eslint/eslint-plugin": "^8.26.0",
+    "@typescript-eslint/parser": "^8.26.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^26.6.3",
+    "jest": "^29.7.0",
     "prettier": "^2.6.2",
-    "ts-jest": "^26.5.0",
-    "typescript": "4.9.3"
+    "ts-jest": "^29.1.2",
+    "typescript": "5.8.2"
   },
   "dependencies": {
+    "dayjs": "^1.11.19",
     "lodash": "^4.17.21"
   }
 }

package/.eslintignore

@@ -1,2 +0,0 @@
-node_modules
-built

package/.eslintrc

@@ -1,21 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended"
-  ],
-  "rules": {
-    "@typescript-eslint/no-extra-boolean-cast": "off",
-    "@typescript-eslint/no-inferrable-types": "off",
-    "no-extra-boolean-cast": "off",
-    "@typescript-eslint/ban-types": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-unused-vars": "error"
-  }
-}

package/.github/workflows/ci.yml

@@ -1,15 +0,0 @@
-name: CI
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install modules
-        run: npm install
-      - name: Run tests
-        run: npm run test
-      - name: Run Types
-        run: npm run types
-      - name: Run Linting
-        run: npm run lint

package/.github/workflows/npm-publish.yml

@@ -1,59 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  push:
-    branches: master
-  workflow_dispatch:
-    inputs:
-      version:
-        required: false
-        type: string
-
-jobs:
-  publish-npm:
-    permissions:
-      id-token: write # for publishing to npm via oidc
-      contents: write # actions/checkout needs read, git tag needs write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '20.17.0'
-          registry-url: https://registry.npmjs.org/
-      - name: Set git user info
-        run: |
-          git config --global user.email "ci@hevyapp.com"
-          git config --global user.name "ci"
-      - name: Update npm # needs 11.5.1+ for Trusted Publishing
-        run: npm install -g npm@11.5.1
-      - run: npm ci
-      - run: npm run types
-      - run: npm run lint
-      - run: npm run test
-      - name: Set npm version
-        run: |
-          npm config set allow-same-version true
-          npm config set git-tag-version false
-          if [ -z "${{ inputs.version }}" ]; then
-            echo 'Latest version currenly on npm:' >&2
-            npm version $(npm show hevy-shared version) >&2
-            echo 'New version:' >&2
-            VERSION="$(npm version patch)"
-            echo $VERSION >&2
-            echo "NPM_VERSION=$VERSION" >>"$GITHUB_ENV"
-          else
-            echo 'Override version:' >&2
-            VERSION="$(npm version ${{ inputs.version }})"
-            echo $VERSION >&2
-            echo "NPM_VERSION=$VERSION" >>"$GITHUB_ENV"
-          fi
-      - name: Tag release
-        run: |
-          git tag "$NPM_VERSION"
-          git push --tags
-      - run: npm run build
-      - run: npm publish

package/.github/workflows/pr-auto-assign.yml

@@ -1,15 +0,0 @@
-name: PR Auto-Assign
-
-on:
-  pull_request_target:
-    types: [opened]
-
-jobs:
-  assign:
-    name: Auto-assign PR to author
-    runs-on: ubuntu-latest
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr edit ${{ github.event.number }} --add-assignee ${{ github.event.sender.login }} -R ${{ github.event.repository.full_name }}

package/.prettierrc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  singleQuote: true,
-  tabWidth: 2,
-  trailingComma: 'all',
-};

package/jest.config.js

@@ -1,4 +0,0 @@
-module.exports = {
-  preset: "ts-jest",
-  testEnvironment: "node",
-};

package/src/chat.ts

@@ -1,130 +0,0 @@
-export interface PostCreateConversationRequest {
-  conversation_user_ids: string[];
-}
-
-export interface PostCreateConversationResponse {
-  conversation_id: string;
-}
-
-export interface PostMessageRequest {
-  conversation_id: string;
-  data:
-    | CreateTextMessageData
-    | CreateNewWorkoutMessageData
-    | CreateNewBodyMeasurementMesageData;
-}
-
-export interface PostMessageResponse {
-  message_id: string;
-}
-
-export interface CreateTextMessageData {
-  type: 'text';
-  text: string;
-}
-export interface CreateNewWorkoutMessageData {
-  type: 'new-workout';
-  workout_id: string;
-}
-export interface CreateNewBodyMeasurementMesageData {
-  type: 'new-body-measurement';
-  measurement_id: number;
-}
-
-export interface GetLatestMessageFromAllClientsResponse {
-  conversations: {
-    conversation_id: string;
-    latest_message: Message;
-    last_read_message_id?: string;
-  }[];
-}
-export interface PostGetMessagesRequest {
-  conversation_id: string;
-  less_than_index?: string;
-  limit: number;
-}
-export interface PostGetMessagesResponse {
-  messages: Message[];
-  last_read_message_id?: string;
-  has_more: boolean;
-}
-export interface PostSetConversationReadAtRequest {
-  conversation_id: string;
-  last_read_message_id: string;
-}
-
-export interface Conversation {
-  conversation_id: string;
-  user_ids: string[];
-}
-
-export type MessageType = 'text' | 'new-workout' | 'new-body-measurement';
-
-export interface MessageBase {
-  id: string;
-  sender_user_id: string;
-  conversation_id: string;
-  type: MessageType;
-  created_at: string;
-}
-
-export interface TextMessage extends MessageBase {
-  type: 'text';
-  text: string;
-}
-
-export interface NewWorkoutMessageData {
-  workout_id: string;
-}
-export interface NewWorkoutMessage extends MessageBase {
-  type: 'new-workout';
-  data: NewWorkoutMessageData;
-}
-
-export interface NewBodyMeasurementMessageData {
-  measurement_id: number;
-}
-
-export interface NewBodyMeasurementMessage extends MessageBase {
-  type: 'new-body-measurement';
-  data: NewBodyMeasurementMessageData;
-}
-
-export type Message =
-  | TextMessage
-  | NewWorkoutMessage
-  | NewBodyMeasurementMessage;
-
-export const isMessage = (message?: any): message is Message => {
-  return (
-    !!message &&
-    !!message.conversation_id &&
-    !!message.sender_user_id &&
-    !!message.type
-  );
-};
-
-export interface NewMessageChatUpdate {
-  type: 'new-message';
-  message: Message;
-}
-export interface MessageDeletedChatUpdate {
-  type: 'message-deleted';
-  message_id: string;
-}
-export interface NewConversationChatUpdate {
-  type: 'new-conversation';
-  conversation_id: string;
-  conversation_users: string[];
-}
-
-export type HevyChatUpdatePush =
-  | NewMessageChatUpdate
-  | MessageDeletedChatUpdate
-  | NewConversationChatUpdate;
-
-export const isHevyChatUpdatePush = (
-  message?: any,
-): message is HevyChatUpdatePush => {
-  return !!message && typeof message.type === 'string';
-};

package/src/coachPlans.ts

@@ -1,57 +0,0 @@
-export const HevyCoachDefaultPlan: Plan = {
-  maximum_clients: 3,
-  id: 'hevy_coach_free',
-  title: 'Free',
-  renewal_period: 'lifetime',
-  type: 'default',
-};
-
-export type PlanType = 'default' | 'paid_paddle' | 'trial' | 'beta';
-
-export interface Plan {
-  title: string;
-  maximum_clients: number;
-  id: string;
-  paddle_update_payment_url?: string;
-  renewal_period: 'monthly' | 'lifetime';
-  renewal_price?: string;
-  renewal_currency?: string;
-  type: PlanType;
-}
-/** https://developer.paddle.com/reference/ZG9jOjI1MzU0MDI2-subscription-status-reference */
-export type CoachPlanStatus =
-  | 'active'
-  | 'past_due'
-  | 'paused'
-  | 'will_pause' /** This is one we added that means the subscription will pause at the end of the current billing period */
-  | 'deleted';
-
-export interface CoachsPlan extends Plan {
-  status: CoachPlanStatus;
-  renewal_date?: string;
-  /** Next bill data from Paddle */
-  next_bill?: {
-    amount: number;
-    currency: string;
-    date: string;
-  };
-  user_previously_started_trial: boolean;
-}
-export interface GetAvailableCoachPlansResponse {
-  available_plans: Plan[];
-}
-export interface GetCoachPlanResponse {
-  current_plan: CoachsPlan;
-}
-export interface CoachPayment {
-  id: number;
-  amount: number;
-  currency: string;
-  is_paid: number;
-  is_one_off_charge: boolean;
-  receipt_url: string;
-  payout_date: string;
-}
-export interface GetCoachPaymentHistoryResponse {
-  payments: CoachPayment[];
-}

package/src/constants.ts

@@ -1,14 +0,0 @@
-export const MAX_WORKOUT_TITLE_LENGTH = 100;
-export const MAX_WORKOUT_DESCRIPTION_LENGTH = 2000;
-export const MAX_WORKOUT_EXERCISE_NOTES_LENGTH = 2000;
-
-export const MAX_ROUTINE_TITLE_LENGTH = 100;
-export const MAX_ROUTINE_EXERCISE_NOTES_LENGTH = 2000;
-
-export const MAX_EXERCISE_TITLE_LENGTH = 100;
-
-export const MAX_COMMENT_LENGTH = 250;
-
-export const MAX_PROFILE_FULL_NAME_LENGTH = 100;
-export const MAX_PROFILE_DESCRIPTION_LENGTH = 200;
-export const MAX_PROFILE_WEBSITE_LENGTH = 100;