hevy-shared 1.0.710 → 1.0.712

package/built/filterExercises.d.ts

@@ -1,4 +1,3 @@
-import Fuse from 'fuse.js';
 import { EquipmentFilter, Language, LibraryExercise, MuscleGroupFilter, CustomExercise } from './index';
 export interface SearchableLibraryExercise extends LibraryExercise {
     localized_muscle_group_name: string;
@@ -21,12 +20,11 @@ interface FilterExercisesProps {
     searchText: string;
     language: Language;
 }
-export declare const createFuseInstance: () => Fuse<string>;
-export declare const newFilterExercises: ({ fuseInstance, exercises, muscleGroupFilter, equipmentType, searchText, language, muscleGroupMatchPenalty, }: FilterExercisesProps & {
-    muscleGroupMatchPenalty: number;
-    fuseInstance: Fuse<string>;
-}) => SearchableExerciseTemplateWithStringScore[];
-export declare const filterExercises: ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }: FilterExercisesProps) => (CustomExercise | LibraryExercise)[];
+export declare const getExerciseMatches: ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }: FilterExercisesProps) => ExerciseSearchMatch<SearchableExerciseTemplate>[];
+export type ExerciseSearchMatch<T> = {
+    exercise: T;
+    matchType: 'title' | 'muscle_group' | 'other' | 'custom';
+};
 /**
  * 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,41 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.popularExerciseTemplateIds = exports.filterExercises = exports.newFilterExercises = exports.createFuseInstance = void 0;
-const fuse_js_1 = __importDefault(require("fuse.js"));
+exports.popularExerciseTemplateIds = exports.getExerciseMatches = void 0;
 const utils_1 = require("./utils");
 const lodash_1 = require("lodash");
-const createFuseInstance = () => {
-    const stringSimilarityFuseInstance = new fuse_js_1.default([''], {
-        includeScore: true,
-        threshold: 0.4,
-        location: 0, // Prefer matches at the beginning of the string
-    });
-    return stringSimilarityFuseInstance;
-};
-exports.createFuseInstance = createFuseInstance;
-const newFilterExercises = ({ fuseInstance, exercises, muscleGroupFilter, equipmentType, searchText, language, muscleGroupMatchPenalty, }) => {
+const getExerciseMatches = ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }) => {
     let result = exercises;
     result = filterExercisesWithMuscleGroup(muscleGroupFilter, result);
     result = filterExercisesWithEquipment(equipmentType, result);
     const normalizedSearchText = normalizeSearchText(searchText, language);
-    result = newFilterExercisesWithSearchText(fuseInstance, normalizedSearchText, result, language, muscleGroupMatchPenalty);
-    result = orderExercisesWithSearchText(normalizedSearchText, result);
-    return result;
+    let matches = filterExercisesWithSearchText(normalizedSearchText, result, language);
+    matches = orderExercisesWithSearchText(normalizedSearchText, matches);
+    return matches;
 };
-exports.newFilterExercises = newFilterExercises;
-const filterExercises = ({ exercises, muscleGroupFilter, equipmentType, searchText, language, }) => {
-    let result = exercises;
-    result = filterExercisesWithMuscleGroup(muscleGroupFilter, result);
-    result = filterExercisesWithEquipment(equipmentType, result);
-    const normalizedSearchText = normalizeSearchText(searchText, language);
-    result = filterExercisesWithSearchText(normalizedSearchText, result, language);
-    result = orderExercisesWithSearchText(normalizedSearchText, result);
-    return result;
-};
-exports.filterExercises = filterExercises;
+exports.getExerciseMatches = getExerciseMatches;
 const filterExercisesWithMuscleGroup = (muscleGroup, exercises) => {
     if (muscleGroup === 'all_muscles') {
         return exercises;
@@ -48,30 +25,13 @@ const filterExercisesWithEquipment = (equipmentType, exercises) => {
     }
     return exercises.filter((rd) => rd.equipment_category === equipmentType);
 };
-const fuseScoreToSimilarity = (score) => {
-    if (score === 0)
-        return 'exact';
-    if (score < 0.05)
-        return 'extremely-similar';
-    if (score < 0.3)
-        return 'very-similar';
-    if (score < 0.6)
-        return 'somewhat-similar';
-    return 'not-similar';
-};
-const getStringSimilarityScore = (searchString, targetString, fuseInstance) => {
-    var _a, _b;
-    fuseInstance.setCollection([targetString]);
-    const result = fuseInstance.search(searchString);
-    const score = (_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.score) !== null && _b !== void 0 ? _b : 1.0;
-    return score;
-};
 // Old filter exercise functionality, will be removed when new feature goes live
 const filterExercisesWithSearchText = (searchText, exercises, language) => {
     if (searchText.length === 0) {
-        return exercises;
+        return exercises.map((e) => ({ exercise: e, matchType: 'other' }));
     }
-    return exercises.filter((e) => {
+    const matches = [];
+    for (const e of exercises) {
         const searchableSearchText = searchable(searchText);
         const searchableEnglishTitle = searchable(e.title);
         const searchableLocalizedTitleMap = !e.is_custom
@@ -99,13 +59,18 @@ const filterExercisesWithSearchText = (searchText, exercises, language) => {
         const searchableTags = !e.is_custom && e.manual_tag ? searchable(e.manual_tag) : '';
         const searchableAka = !e.is_custom && e.aka ? searchable(e.aka) : '';
         if (searchableLocalizedTitle.includes(searchableSearchText) ||
-            searchableEnglishTitle.includes(searchableSearchText) ||
-            searchableLocalizedMuscleGroupName.includes(searchableSearchText) ||
+            searchableEnglishTitle.includes(searchableSearchText)) {
+            matches.push({ exercise: e, matchType: 'title' });
+            continue;
+        }
+        else if (searchableLocalizedMuscleGroupName.includes(searchableSearchText) ||
             searchableMuscleGroup.includes(searchableSearchText)) {
-            return true;
+            matches.push({ exercise: e, matchType: 'muscle_group' });
+            continue;
         }
         if (e.is_custom && 'custom'.includes(searchableSearchText)) {
-            return true;
+            matches.push({ exercise: e, matchType: 'custom' });
+            continue;
         }
         const splitSearch = searchableSearchText.split(' ');
         const splitTitle = [
@@ -121,111 +86,29 @@ 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) {
-            return true;
+            matches.push({ exercise: e, matchType: 'other' });
+            continue;
         }
-        return false;
-    });
-};
-const newFilterExercisesWithSearchText = (fuseInstance, searchText, exercises, language, 
-// 0 means no penalty, 1 means don't match muscle groups (because a score > 1 means no match)
-muscleGroupMatchPenalty) => {
-    if (searchText.length === 0) {
-        return exercises;
     }
-    return exercises.reduce((accu, 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 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 englishSimilarityScore = getStringSimilarityScore(searchableSearchText, searchableEnglishTitle, fuseInstance);
-        const localizedSimilarityScore = getStringSimilarityScore(searchableSearchText, searchableLocalizedTitle, fuseInstance);
-        let englishMuscleGroupSimilarityScore = 1;
-        let muscleGroupSimilarityScore = 1;
-        if (muscleGroupMatchPenalty < 1) {
-            englishMuscleGroupSimilarityScore = getStringSimilarityScore(searchableSearchText, searchableMuscleGroup, fuseInstance);
-            muscleGroupSimilarityScore = getStringSimilarityScore(searchableSearchText, searchableLocalizedMuscleGroupName, fuseInstance);
-        }
-        // We always return the best score, regardless of where the match happens
-        const bestScore = Math.min(englishSimilarityScore, localizedSimilarityScore, englishMuscleGroupSimilarityScore + muscleGroupMatchPenalty, muscleGroupSimilarityScore + muscleGroupMatchPenalty);
-        if (fuseScoreToSimilarity(englishSimilarityScore) !== 'not-similar') {
-            accu.push(Object.assign(Object.assign({}, e), { searchStringScore: bestScore }));
-            return accu;
-        }
-        if (fuseScoreToSimilarity(localizedSimilarityScore) !== 'not-similar') {
-            accu.push(Object.assign(Object.assign({}, e), { searchStringScore: bestScore }));
-            return accu;
-        }
-        if (['exact', 'extremely-similar'].includes(fuseScoreToSimilarity(englishMuscleGroupSimilarityScore))) {
-            accu.push(Object.assign(Object.assign({}, e), { searchStringScore: bestScore }));
-            return accu;
-        }
-        if (['exact', 'extremely-similar'].includes(fuseScoreToSimilarity(muscleGroupSimilarityScore))) {
-            accu.push(Object.assign(Object.assign({}, e), { searchStringScore: bestScore }));
-            return accu;
-        }
-        if (e.is_custom && 'custom'.includes(searchableSearchText)) {
-            accu.push(e);
-            return accu;
-        }
-        const splitSearch = searchableSearchText.split(' ');
-        const splitTitle = [
-            searchableLocalizedTitle,
-            searchableEnglishTitle,
-            searchableTags,
-            searchableAka,
-            searchableMisspelledDumbbellEquipment,
-        ]
-            .join(' ')
-            .split(' ');
-        // Find:
-        // title ['arnold', 'press', '(barbell)']
-        // search ['press', 'bar']
-        if ((0, lodash_1.intersectionWith)(splitSearch, splitTitle, (search, title) => title.includes(search)).length === splitSearch.length) {
-            accu.push(e);
-            return accu;
-        }
-        return accu;
-    }, []);
+    return matches;
 };
-const orderExercisesWithSearchText = (searchText, exercises) => {
+const orderExercisesWithSearchText = (searchText, exerciseMatches) => {
     if (searchText.length === 0) {
-        return exercises;
+        return exerciseMatches;
     }
-    return exercises
-        .reduce((accu, currentExercise) => {
-        const lowercaseTitle = currentExercise.title.toLowerCase();
+    return exerciseMatches
+        .reduce((accu, currentMatch) => {
+        const lowercaseTitle = currentMatch.exercise.title.toLowerCase();
         if (lowercaseTitle.startsWith(searchText)) {
             accu.push({
-                exercise: currentExercise,
-                weight: currentExercise.priority * 2,
+                exercise: currentMatch,
+                weight: currentMatch.exercise.priority * 2,
             });
             return accu;
         }
         accu.push({
-            exercise: currentExercise,
-            weight: currentExercise.priority,
+            exercise: currentMatch,
+            weight: currentMatch.exercise.priority,
         });
         return accu;
     }, [])

package/built/index.d.ts

@@ -1198,6 +1198,8 @@ export interface OutstandingInvitesForCoachTeamResponse {
     invites: CoachTeamInvite[];
 }
 export interface HevyTrainerProgram {
+    created_at: string;
+    updated_at: string;
     title: string;
     level: TrainingLevel;
     goal: TrainingGoal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.710",
+  "version": "1.0.712",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
@@ -35,7 +35,6 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "fuse.js": "^7.0.0",
     "lodash": "^4.17.21"
   }
 }