hevy-shared 1.0.960 → 1.0.962

package/.eslintignore

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

package/.eslintrc

@@ -0,0 +1,21 @@
+{
+  "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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,59 @@
+# 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

@@ -0,0 +1,15 @@
+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

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

package/README.md

@@ -1,20 +1,5 @@
 # hevy-shared
 Common code shared by the other repos.
 
-## Publishing to npm
-
-There are two ways of publishing a new version of `hevy-shared` to npm.
-
-### Automatically
-
-Merging PRs to `master` will automatically trigger the publishing of a new patch version to npm using Github Actions (see .github/workflows). Go to https://www.npmjs.com/package/hevy-shared for more information.
-
-**Important note:** Please do **NOT** merge your `hevy-shared` PRs into `master` until _all_ the other repos (regardless of whether they use npm or Git submodules) which depend on your `hevy-shared` PR have their respective PRs merged into their respective main branches.
-Doing so should help avoid type errors and conflicts more than doing it the other way around, even though they can still happen.
-
-### Manually
-
-To publish manually, run `npm run ci-build` _on the branch of your choice_. This is useful if you need to get your changes into a repo which doesn't use Git submodules.
-
-Running the command will print the next unused version number, which should be the version of the newly published package. You will just have to wait until it's actually published before you can install it.
-You can run `npm view hevy-shared version` to check the current `latest` version that's available on npm at any given moment.
+## Deploying
+Merging PRs to `master` will automatically trigger the deployment of a new patch version to npm using github actions (see ./github/workflows). Go to https://www.npmjs.com/package/hevy-shared for more information

package/built/chat.d.ts

@@ -6,15 +6,7 @@ export interface PostCreateConversationResponse {
 }
 export interface PostMessageRequest {
     conversation_id: string;
-    data: CreateTextMessageData | CreateVideoMessageData | CreateImageMessageData;
-}
-export interface PostGetDeletedMessagesRequest {
-    messages_deleted_since_time?: string;
-    conversation_id: string;
-}
-export interface PostDeletedMessagesResponse {
-    deleted_message_ids: string[];
-    checked_at_time: string;
+    data: CreateTextMessageData | CreateNewWorkoutMessageData | CreateNewBodyMeasurementMesageData;
 }
 export interface PostMessageResponse {
     message_id: string;
@@ -23,13 +15,13 @@ export interface CreateTextMessageData {
     type: 'text';
     text: string;
 }
-export interface CreateVideoMessageData {
-    type: 'video';
-    video_url: string;
+export interface CreateNewWorkoutMessageData {
+    type: 'new-workout';
+    workout_id: string;
 }
-export interface CreateImageMessageData {
-    type: 'image';
-    image_url: string;
+export interface CreateNewBodyMeasurementMesageData {
+    type: 'new-body-measurement';
+    measurement_id: number;
 }
 export interface GetLatestMessageFromAllClientsResponse {
     conversations: {
@@ -56,7 +48,7 @@ export interface Conversation {
     conversation_id: string;
     user_ids: string[];
 }
-export type MessageType = 'text' | 'video' | 'image';
+export type MessageType = 'text' | 'new-workout' | 'new-body-measurement';
 export interface MessageBase {
     id: string;
     sender_user_id: string;
@@ -68,15 +60,21 @@ export interface TextMessage extends MessageBase {
     type: 'text';
     text: string;
 }
-export interface VideoMessage extends MessageBase {
-    type: 'video';
-    video_url: 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 ImageMessage extends MessageBase {
-    type: 'image';
-    image_url: string;
+export interface NewBodyMeasurementMessage extends MessageBase {
+    type: 'new-body-measurement';
+    data: NewBodyMeasurementMessageData;
 }
-export type Message = TextMessage | VideoMessage | ImageMessage;
+export type Message = TextMessage | NewWorkoutMessage | NewBodyMeasurementMessage;
 export declare const isMessage: (message?: any) => message is Message;
 export interface NewMessageChatUpdate {
     type: 'new-message';
@@ -91,5 +89,5 @@ export interface NewConversationChatUpdate {
     conversation_id: string;
     conversation_users: string[];
 }
-export type HevyChatUpdateMobilePushData = NewMessageChatUpdate | MessageDeletedChatUpdate | NewConversationChatUpdate;
-export declare const isHevyChatUpdatePush: (message?: any) => message is HevyChatUpdateMobilePushData;
+export type HevyChatUpdatePush = NewMessageChatUpdate | MessageDeletedChatUpdate | NewConversationChatUpdate;
+export declare const isHevyChatUpdatePush: (message?: any) => message is HevyChatUpdatePush;

package/built/coachPlans.d.ts

@@ -1,11 +1,10 @@
 export declare const HevyCoachDefaultPlan: Plan;
-export type PlanType = 'none' | 'paid_paddle' | 'trial' | 'beta';
+export type PlanType = 'default' | 'paid_paddle' | 'trial' | 'beta';
 export interface Plan {
     title: string;
     maximum_clients: number;
     id: string;
     paddle_update_payment_url?: string;
-    paddle_subscription_id?: number;
     renewal_period: 'monthly' | 'lifetime';
     renewal_price?: string;
     renewal_currency?: string;

package/built/coachPlans.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HevyCoachDefaultPlan = void 0;
 exports.HevyCoachDefaultPlan = {
-    maximum_clients: 0,
+    maximum_clients: 3,
     id: 'hevy_coach_free',
     title: 'Free',
     renewal_period: 'lifetime',
-    type: 'none',
+    type: 'default',
 };

package/built/filterExercises.d.ts

@@ -1,19 +1,7 @@
-import { EquipmentFilter, LibraryExercise, MuscleGroupFilter, CustomExercise } from './index';
-import { Language } from './translations';
-export interface SearchableLibraryExercise extends LibraryExercise {
+import { EquipmentFilter, ExerciseTemplate, Language, MuscleGroupFilter } from './index';
+export interface SearchableExerciseTemplate extends ExerciseTemplate {
     localized_muscle_group_name: string;
 }
-export interface SearchableCustomExercise extends CustomExercise {
-    localized_muscle_group_name: string;
-}
-export type SearchableExerciseTemplate = SearchableLibraryExercise | SearchableCustomExercise;
-export interface SearchableLibraryExerciseWithStringScore<T = number> extends SearchableLibraryExercise {
-    searchStringScore?: T;
-}
-export interface SearchableCustomExerciseWithStringScore<T = number> extends SearchableCustomExercise {
-    searchStringScore?: T;
-}
-export type SearchableExerciseTemplateWithStringScore<T = number> = SearchableLibraryExerciseWithStringScore<T> | SearchableCustomExerciseWithStringScore<T>;
 interface FilterExercisesProps {
     exercises: SearchableExerciseTemplate[];
     muscleGroupFilter: MuscleGroupFilter;
@@ -21,11 +9,7 @@ interface FilterExercisesProps {
     searchText: string;
     language: Language;
 }
-export declare const getExerciseMatches: ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }: FilterExercisesProps) => ExerciseSearchMatch<SearchableExerciseTemplate>[];
-export type ExerciseSearchMatch<T> = {
-    exercise: T;
-    matchType: 'title' | 'muscle_group' | 'other' | 'custom';
-};
+export declare const filterExercises: ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }: FilterExercisesProps) => ExerciseTemplate[];
 /**
  * Exercise templates that are shown at the top of the Exercise Library to
  * users who don't have any workouts logged.

package/built/filterExercises.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.popularExerciseTemplateIds = exports.getExerciseMatches = void 0;
-const utils_1 = require("./utils");
+exports.popularExerciseTemplateIds = exports.filterExercises = void 0;
 const lodash_1 = require("lodash");
-const getExerciseMatches = ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }) => {
+const utils_1 = require("./utils");
+const filterExercises = ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }) => {
     let result = exercises;
     result = filterExercisesWithMuscleGroup(muscleGroupFilter, result);
     result = filterExercisesWithEquipment(equipmentType, result);
     const normalizedSearchText = normalizeSearchText(searchText, language);
-    let matches = filterExercisesWithSearchText(normalizedSearchText, result, language);
-    matches = orderExercisesWithSearchText(normalizedSearchText, matches);
-    return matches;
+    result = filterExercisesWithSearchText(normalizedSearchText, result, language);
+    result = orderExercisesWithSearchText(normalizedSearchText, result);
+    return result;
 };
-exports.getExerciseMatches = getExerciseMatches;
+exports.filterExercises = filterExercises;
 const filterExercisesWithMuscleGroup = (muscleGroup, exercises) => {
     if (muscleGroup === 'all_muscles') {
         return exercises;
@@ -25,52 +25,41 @@ const filterExercisesWithEquipment = (equipmentType, exercises) => {
     }
     return exercises.filter((rd) => rd.equipment_category === equipmentType);
 };
-// Old filter exercise functionality, will be removed when new feature goes live
 const filterExercisesWithSearchText = (searchText, exercises, language) => {
     if (searchText.length === 0) {
-        return exercises.map((e) => ({ exercise: e, matchType: 'other' }));
+        return exercises;
     }
-    const matches = [];
-    for (const e of exercises) {
+    return exercises.filter((e) => {
         const searchableSearchText = searchable(searchText);
         const searchableEnglishTitle = searchable(e.title);
-        const searchableLocalizedTitleMap = !e.is_custom
-            ? {
-                en: searchable(e.title),
-                es: e.es_title ? searchable(e.es_title) : undefined,
-                de: e.de_title ? searchable(e.de_title) : undefined,
-                fr: e.fr_title ? searchable(e.fr_title) : undefined,
-                it: e.it_title ? searchable(e.it_title) : undefined,
-                pt: e.pt_title ? searchable(e.pt_title) : undefined,
-                tr: e.tr_title ? searchable(e.tr_title) : undefined,
-                zh_CN: e.zh_cn_title ? searchable(e.zh_cn_title) : undefined,
-                zh_TW: e.zh_tw_title ? searchable(e.zh_tw_title) : undefined,
-                ru: e.ru_title ? searchable(e.ru_title) : undefined,
-                ja: e.ja_title ? searchable(e.ja_title) : undefined,
-                ko: e.ko_title ? searchable(e.ko_title) : undefined,
-            }
-            : {
-                en: searchable(e.title),
-            };
+        const searchableLocalizedTitleMap = {
+            en: searchable(e.title),
+            es: e.es_title ? searchable(e.es_title) : undefined,
+            de: e.de_title ? searchable(e.de_title) : undefined,
+            fr: e.fr_title ? searchable(e.fr_title) : undefined,
+            it: e.it_title ? searchable(e.it_title) : undefined,
+            pt: e.pt_title ? searchable(e.pt_title) : undefined,
+            tr: e.tr_title ? searchable(e.tr_title) : undefined,
+            zh_CN: e.zh_cn_title ? searchable(e.zh_cn_title) : undefined,
+            zh_TW: e.zh_tw_title ? searchable(e.zh_tw_title) : undefined,
+            ru: e.ru_title ? searchable(e.ru_title) : undefined,
+            ja: e.ja_title ? searchable(e.ja_title) : undefined,
+            ko: e.ko_title ? searchable(e.ko_title) : undefined,
+        };
         const searchableLocalizedTitle = searchableLocalizedTitleMap[language] || searchableLocalizedTitleMap.en;
         const searchableLocalizedMuscleGroupName = searchable(e.localized_muscle_group_name);
         const searchableMuscleGroup = searchable(e.muscle_group);
         const searchableMisspelledDumbbellEquipment = e.equipment_category === 'dumbbell' ? 'dumbell' : '';
-        const searchableTags = !e.is_custom && e.manual_tag ? searchable(e.manual_tag) : '';
-        const searchableAka = !e.is_custom && e.aka ? searchable(e.aka) : '';
+        const searchableTags = e.manual_tag ? searchable(e.manual_tag) : '';
+        const searchableAka = e.aka ? searchable(e.aka) : '';
         if (searchableLocalizedTitle.includes(searchableSearchText) ||
-            searchableEnglishTitle.includes(searchableSearchText)) {
-            matches.push({ exercise: e, matchType: 'title' });
-            continue;
-        }
-        else if (searchableLocalizedMuscleGroupName.includes(searchableSearchText) ||
+            searchableEnglishTitle.includes(searchableSearchText) ||
+            searchableLocalizedMuscleGroupName.includes(searchableSearchText) ||
             searchableMuscleGroup.includes(searchableSearchText)) {
-            matches.push({ exercise: e, matchType: 'muscle_group' });
-            continue;
+            return true;
         }
         if (e.is_custom && 'custom'.includes(searchableSearchText)) {
-            matches.push({ exercise: e, matchType: 'custom' });
-            continue;
+            return true;
         }
         const splitSearch = searchableSearchText.split(' ');
         const splitTitle = [
@@ -86,29 +75,28 @@ const filterExercisesWithSearchText = (searchText, exercises, language) => {
         // title ['arnold', 'press', '(barbell)']
         // search ['press', 'bar']
         if ((0, lodash_1.intersectionWith)(splitSearch, splitTitle, (search, title) => title.includes(search)).length === splitSearch.length) {
-            matches.push({ exercise: e, matchType: 'other' });
-            continue;
+            return true;
         }
-    }
-    return matches;
+        return false;
+    });
 };
-const orderExercisesWithSearchText = (searchText, exerciseMatches) => {
+const orderExercisesWithSearchText = (searchText, exercises) => {
     if (searchText.length === 0) {
-        return exerciseMatches;
+        return exercises;
     }
-    return exerciseMatches
-        .reduce((accu, currentMatch) => {
-        const lowercaseTitle = currentMatch.exercise.title.toLowerCase();
+    return exercises
+        .reduce((accu, currentExercise) => {
+        const lowercaseTitle = currentExercise.title.toLowerCase();
         if (lowercaseTitle.startsWith(searchText)) {
             accu.push({
-                exercise: currentMatch,
-                weight: currentMatch.exercise.priority * 2,
+                exercise: currentExercise,
+                weight: currentExercise.priority * 2,
             });
             return accu;
         }
         accu.push({
-            exercise: currentMatch,
-            weight: currentMatch.exercise.priority,
+            exercise: currentExercise,
+            weight: currentExercise.priority,
         });
         return accu;
     }, [])
@@ -138,24 +126,24 @@ const searchable = (str) => {
  * users who don't have any workouts logged.
  */
 exports.popularExerciseTemplateIds = [
-    'B8127AD1', // Lying Leg Curl (Machine)"
-    '11A123F3', // Seated Leg Curl (Machine)"
-    'D04AC939', // Squat (Barbell)"
-    '75A4F6C4', // Leg Extension (Machine)"
-    '422B08F1', // Lateral Raise (Dumbbell)"
-    'C7973E0E', // Leg Press (Machine)"
-    '07B38369', // Incline Bench Press (Dumbbell)"
-    '3601968B', // Bench Press (Dumbbell)"
-    '6A6C31A5', // Lat Pulldown (Cable)"
-    '0393F233', // Seated Cable Row - V Grip (Cable)"
-    '37FCC2BB', // Bicep Curl (Dumbbell)"
-    '55E6546F', // Bent Over Row (Barbell)"
-    '94B7239B', // Triceps Rope Pushdown"
-    'C6272009', // Deadlift (Barbell)"
-    '878CD1D0', // Shoulder Press (Dumbbell)"
-    '651F844C', // Cable Fly Crossovers"
-    '79D0BB3A', // Bench Press (Barbell)"
-    '93A552C6', // Triceps Pushdown"
-    '7E3BC8B6', // Hammer Curl (Dumbbell)"
+    'B8127AD1',
+    '11A123F3',
+    'D04AC939',
+    '75A4F6C4',
+    '422B08F1',
+    'C7973E0E',
+    '07B38369',
+    '3601968B',
+    '6A6C31A5',
+    '0393F233',
+    '37FCC2BB',
+    '55E6546F',
+    '94B7239B',
+    'C6272009',
+    '878CD1D0',
+    '651F844C',
+    '79D0BB3A',
+    '93A552C6',
+    '7E3BC8B6',
     'BE640BA0', // Face Pull
 ];