@aneuhold/core-ts-db-lib 5.0.7 → 5.0.9

package/lib/services/dashboard/Task/{TaskSortService.d.ts → TaskSort.service.d.ts}

@@ -7,6 +7,7 @@ import type { DashboardTagSettings } from '../../../embedded-types/dashboard/use
  * A service for sorting tasks.
  */
 export default class DashboardTaskSortService {
+    #private;
     /**
      * Sorts the provided task IDs based on the provided sort settings.
      *
@@ -31,46 +32,5 @@ export default class DashboardTaskSortService {
      * @returns A map of task IDs to tag header names.
      */
     static getTagHeaderMap(taskMap: DashboardTaskMap, taskIds: UUID[], userId: UUID, tagSettings: DashboardTagSettings, noPriorityTagsIndicator: string, sortDirection: DashboardTaskSortDirection): Record<UUID, string>;
-    /**
-     * Gets the task sort function based on the sort by and sort direction.
-     *
-     * @param sortBy The field to sort by.
-     * @param sortDirection The direction to sort.
-     * @param tagSettings The tag settings.
-     * @param userId The user ID.
-     * @returns A function that compares two tasks.
-     */
-    private static getTaskSortFunction;
-    /**
-     * Gets the highest priority tag for the provided task. If there are no tags,
-     * or if there are no tags with a priority, then this will return null.
-     *
-     * @param task The task.
-     * @param userId The user ID.
-     * @param tagSettings The tag settings.
-     * @param sortDirection The sort direction.
-     * @returns The highest priority tag or null.
-     */
-    private static getHighestPriorityTag;
-    /**
-     * Gets the highest priority tag value for the provided task.
-     *
-     * @param task The task.
-     * @param userId The user ID.
-     * @param tagSettings The tag settings.
-     * @param sortDirection The sort direction.
-     * @returns The highest priority tag value.
-     */
-    private static getHighestPriorityTagValue;
-    /**
-     * Gets the priority tag for the provided task.
-     *
-     * @param task The task.
-     * @param userId The user ID.
-     * @param tagSettings The tag settings.
-     * @param sortDirection The sort direction.
-     * @returns The priority tag or null.
-     */
-    private static getPriorityTagForTask;
 }
-//# sourceMappingURL=TaskSortService.d.ts.map
+//# sourceMappingURL=TaskSort.service.d.ts.map

package/lib/services/dashboard/Task/TaskSort.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TaskSort.service.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSort.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wDAAwD,CAAC;AAC5G,OAAO,EAEL,0BAA0B,EAC3B,MAAM,wDAAwD,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAEjG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAwB;;IAC3C;;;;;;;;OAQG;IACH,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,IAAI,EAAE,EACf,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB,GAChC,IAAI,EAAE;IAyBT;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,eAAe,CACpB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,IAAI,EAAE,EACf,MAAM,EAAE,IAAI,EACZ,WAAW,EAAE,oBAAoB,EACjC,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,0BAA0B,GACxC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;CAmLxB"}

package/lib/services/dashboard/Task/{TaskSortService.js → TaskSort.service.js}

@@ -21,7 +21,7 @@ export default class DashboardTaskSortService {
             for (const sortSetting of sortSettings.sortList) {
                 const { sortBy } = sortSetting;
                 const { sortDirection } = sortSetting;
-                const result = this.getTaskSortFunction(sortBy, sortDirection, tagSettings, sortSettings.userId)(taskA, taskB);
+                const result = this.#getTaskSortFunction(sortBy, sortDirection, tagSettings, sortSettings.userId)(taskA, taskB);
                 if (result !== 0) {
                     return result;
                 }
@@ -49,7 +49,7 @@ export default class DashboardTaskSortService {
         const firstTask = taskMap[taskIds[0]];
         if (!firstTask)
             return tagHeaderMap;
-        let tag = this.getHighestPriorityTag(firstTask, userId, tagSettings, sortDirection);
+        let tag = this.#getHighestPriorityTag(firstTask, userId, tagSettings, sortDirection);
         if (!tag) {
             tagHeaderMap[taskIds[0]] = noPriorityTagsIndicator;
         }
@@ -59,7 +59,7 @@ export default class DashboardTaskSortService {
         for (let i = 1; i < taskIds.length; i += 1) {
             const task = taskMap[taskIds[i]];
             if (task) {
-                const taskTag = this.getHighestPriorityTag(task, userId, tagSettings, sortDirection);
+                const taskTag = this.#getHighestPriorityTag(task, userId, tagSettings, sortDirection);
                 if (taskTag !== tag && tag !== noPriorityTagsIndicator) {
                     tag = taskTag || noPriorityTagsIndicator;
                     tagHeaderMap[taskIds[i]] = tag;
@@ -77,12 +77,12 @@ export default class DashboardTaskSortService {
      * @param userId The user ID.
      * @returns A function that compares two tasks.
      */
-    static getTaskSortFunction(sortBy, sortDirection, tagSettings, userId) {
+    static #getTaskSortFunction(sortBy, sortDirection, tagSettings, userId) {
         switch (sortBy) {
             case DashboardTaskSortBy.tags:
                 return (taskA, taskB) => {
-                    const highestPriorityTagA = this.getHighestPriorityTagValue(taskA, userId, tagSettings, sortDirection);
-                    const highestPriorityTagB = this.getHighestPriorityTagValue(taskB, userId, tagSettings, sortDirection);
+                    const highestPriorityTagA = this.#getHighestPriorityTagValue(taskA, userId, tagSettings, sortDirection);
+                    const highestPriorityTagB = this.#getHighestPriorityTagValue(taskB, userId, tagSettings, sortDirection);
                     if (highestPriorityTagA === highestPriorityTagB) {
                         return 0;
                     }
@@ -140,8 +140,8 @@ export default class DashboardTaskSortService {
      * @param sortDirection The sort direction.
      * @returns The highest priority tag or null.
      */
-    static getHighestPriorityTag(task, userId, tagSettings, sortDirection) {
-        const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
+    static #getHighestPriorityTag(task, userId, tagSettings, sortDirection) {
+        const priorityTag = this.#getPriorityTagForTask(task, userId, tagSettings, sortDirection);
         return priorityTag ? priorityTag.tag : null;
     }
     /**
@@ -153,8 +153,8 @@ export default class DashboardTaskSortService {
      * @param sortDirection The sort direction.
      * @returns The highest priority tag value.
      */
-    static getHighestPriorityTagValue(task, userId, tagSettings, sortDirection) {
-        const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
+    static #getHighestPriorityTagValue(task, userId, tagSettings, sortDirection) {
+        const priorityTag = this.#getPriorityTagForTask(task, userId, tagSettings, sortDirection);
         return priorityTag ? priorityTag.priority : 0;
     }
     /**
@@ -166,7 +166,7 @@ export default class DashboardTaskSortService {
      * @param sortDirection The sort direction.
      * @returns The priority tag or null.
      */
-    static getPriorityTagForTask(task, userId, tagSettings, sortDirection) {
+    static #getPriorityTagForTask(task, userId, tagSettings, sortDirection) {
         let priorityTag = null;
         const tags = task.tags[userId];
         if (!tags || tags.length === 0)
@@ -192,4 +192,4 @@ export default class DashboardTaskSortService {
         return priorityTag;
     }
 }
-//# sourceMappingURL=TaskSortService.js.map
+//# sourceMappingURL=TaskSort.service.js.map

package/lib/services/dashboard/Task/TaskSort.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TaskSort.service.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSort.service.ts"],"names":[],"mappings":"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"}

package/lib/services/dashboard/Task/{TaskSortService.ts → TaskSort.service.ts}

@@ -36,7 +36,7 @@ export default class DashboardTaskSortService {
         const { sortBy } = sortSetting;
         const { sortDirection } = sortSetting;
 
-        const result = this.getTaskSortFunction(
+        const result = this.#getTaskSortFunction(
           sortBy,
           sortDirection,
           tagSettings,
@@ -75,7 +75,7 @@ export default class DashboardTaskSortService {
     if (taskIds.length === 0 || taskIds.length === 1) return tagHeaderMap;
     const firstTask = taskMap[taskIds[0]];
     if (!firstTask) return tagHeaderMap;
-    let tag = this.getHighestPriorityTag(firstTask, userId, tagSettings, sortDirection);
+    let tag = this.#getHighestPriorityTag(firstTask, userId, tagSettings, sortDirection);
     if (!tag) {
       tagHeaderMap[taskIds[0]] = noPriorityTagsIndicator;
     } else {
@@ -84,7 +84,7 @@ export default class DashboardTaskSortService {
     for (let i = 1; i < taskIds.length; i += 1) {
       const task = taskMap[taskIds[i]];
       if (task) {
-        const taskTag = this.getHighestPriorityTag(task, userId, tagSettings, sortDirection);
+        const taskTag = this.#getHighestPriorityTag(task, userId, tagSettings, sortDirection);
         if (taskTag !== tag && tag !== noPriorityTagsIndicator) {
           tag = taskTag || noPriorityTagsIndicator;
           tagHeaderMap[taskIds[i]] = tag;
@@ -103,7 +103,7 @@ export default class DashboardTaskSortService {
    * @param userId The user ID.
    * @returns A function that compares two tasks.
    */
-  private static getTaskSortFunction(
+  static #getTaskSortFunction(
     sortBy: DashboardTaskSortBy,
     sortDirection: DashboardTaskSortDirection,
     tagSettings: DashboardTagSettings,
@@ -112,13 +112,13 @@ export default class DashboardTaskSortService {
     switch (sortBy) {
       case DashboardTaskSortBy.tags:
         return (taskA: DashboardTask, taskB: DashboardTask) => {
-          const highestPriorityTagA = this.getHighestPriorityTagValue(
+          const highestPriorityTagA = this.#getHighestPriorityTagValue(
             taskA,
             userId,
             tagSettings,
             sortDirection
           );
-          const highestPriorityTagB = this.getHighestPriorityTagValue(
+          const highestPriorityTagB = this.#getHighestPriorityTagValue(
             taskB,
             userId,
             tagSettings,
@@ -179,13 +179,13 @@ export default class DashboardTaskSortService {
    * @param sortDirection The sort direction.
    * @returns The highest priority tag or null.
    */
-  private static getHighestPriorityTag(
+  static #getHighestPriorityTag(
     task: DashboardTask,
     userId: UUID,
     tagSettings: DashboardTagSettings,
     sortDirection: DashboardTaskSortDirection
   ): string | null {
-    const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
+    const priorityTag = this.#getPriorityTagForTask(task, userId, tagSettings, sortDirection);
     return priorityTag ? priorityTag.tag : null;
   }
 
@@ -198,13 +198,13 @@ export default class DashboardTaskSortService {
    * @param sortDirection The sort direction.
    * @returns The highest priority tag value.
    */
-  private static getHighestPriorityTagValue(
+  static #getHighestPriorityTagValue(
     task: DashboardTask,
     userId: UUID,
     tagSettings: DashboardTagSettings,
     sortDirection: DashboardTaskSortDirection
   ): number {
-    const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
+    const priorityTag = this.#getPriorityTagForTask(task, userId, tagSettings, sortDirection);
     return priorityTag ? priorityTag.priority : 0;
   }
 
@@ -217,7 +217,7 @@ export default class DashboardTaskSortService {
    * @param sortDirection The sort direction.
    * @returns The priority tag or null.
    */
-  private static getPriorityTagForTask(
+  static #getPriorityTagForTask(
     task: DashboardTask,
     userId: UUID,
     tagSettings: DashboardTagSettings,

package/lib/services/workout/EquipmentType/{WorkoutEquipmentTypeService.d.ts → WorkoutEquipmentType.service.d.ts}

@@ -45,4 +45,4 @@ export default class WorkoutEquipmentTypeService {
      */
     static findNearestWeight(equipmentType: WorkoutEquipmentType, targetWeight: number, direction: 'up' | 'down' | 'nearest' | 'prefer-down' | 'prefer-up'): number | null;
 }
-//# sourceMappingURL=WorkoutEquipmentTypeService.d.ts.map
+//# sourceMappingURL=WorkoutEquipmentType.service.d.ts.map

package/lib/services/workout/EquipmentType/WorkoutEquipmentType.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkoutEquipmentType.service.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/EquipmentType/WorkoutEquipmentType.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAE/F;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA2B;IAC9C;;;;;;;;;OASG;IACH,MAAM,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAY/F;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,0BAA0B,CAC/B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,GAC/C,MAAM,EAAE;IAoBX;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,iBAAiB,CACtB,aAAa,EAAE,oBAAoB,EACnC,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,WAAW,GACjE,MAAM,GAAG,IAAI;CAyCjB"}

package/lib/services/workout/EquipmentType/{WorkoutEquipmentTypeService.js → WorkoutEquipmentType.service.js}

@@ -101,4 +101,4 @@ export default class WorkoutEquipmentTypeService {
         return downDiff <= upDiff ? downResult : upResult;
     }
 }
-//# sourceMappingURL=WorkoutEquipmentTypeService.js.map
+//# sourceMappingURL=WorkoutEquipmentType.service.js.map

package/lib/services/workout/EquipmentType/WorkoutEquipmentType.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkoutEquipmentType.service.js","sourceRoot":"","sources":["../../../../src/services/workout/EquipmentType/WorkoutEquipmentType.service.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA2B;IAC9C;;;;;;;;;OASG;IACH,MAAM,CAAC,qBAAqB,CAAC,SAAiB,EAAE,SAAiB,EAAE,SAAiB;QAClF,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,IAAI,aAAa,GAAG,SAAS,CAAC;QAE9B,OAAO,aAAa,IAAI,SAAS,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC5B,aAAa,IAAI,SAAS,CAAC;QAC7B,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,0BAA0B,CAC/B,SAAiB,EACjB,MAAgD;QAEhD,IAAI,SAAS,GAAG,IAAI,GAAG,CAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC;gBAAE,SAAS;YACpD,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;oBAClD,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;gBACrD,CAAC;YACH,CAAC;YACD,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;YACjD,IAAI,SAAS,CAAC,IAAI,GAAG,IAAI;gBAAE,MAAM;QACnC,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,GAAG,SAAS,CAAC;aAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;aACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aACrB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,iBAAiB,CACtB,aAAmC,EACnC,YAAoB,EACpB,SAAkE;QAElE,IAAI,CAAC,aAAa,CAAC,aAAa,IAAI,aAAa,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,aAAa,GAAG,CAAC,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE7E,gDAAgD;QAChD,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC;QAChF,MAAM,UAAU,GACd,aAAa;aACV,KAAK,EAAE;aACP,OAAO,EAAE;aACT,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC;QAEtD,wBAAwB;QACxB,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YACzB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,IAAI,SAAS,KAAK,aAAa,EAAE,CAAC;YAChC,OAAO,UAAU,IAAI,QAAQ,CAAC;QAChC,CAAC;QAED,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;YAC9B,OAAO,QAAQ,IAAI,UAAU,CAAC;QAChC,CAAC;QAED,0BAA0B;QAC1B,IAAI,QAAQ,KAAK,IAAI;YAAE,OAAO,UAAU,CAAC;QACzC,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,QAAQ,CAAC;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,QAAQ,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,UAAU,CAAC,CAAC;QAErD,OAAO,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;IACpD,CAAC;CACF"}

package/lib/services/workout/Exercise/WorkoutExercise.service.d.ts

@@ -0,0 +1,52 @@
+import type { WorkoutEquipmentType } from '../../../documents/workout/WorkoutEquipmentType.js';
+import type { WorkoutExercise } from '../../../documents/workout/WorkoutExercise.js';
+import { ExerciseRepRange } from '../../../documents/workout/WorkoutExercise.js';
+import type { WorkoutExerciseCalibration } from '../../../documents/workout/WorkoutExerciseCalibration.js';
+import type { WorkoutSet } from '../../../documents/workout/WorkoutSet.js';
+/**
+ * A service for handling operations related to {@link WorkoutExercise}s.
+ */
+export default class WorkoutExerciseService {
+    #private;
+    /**
+     * Returns the numeric rep range based on the ExerciseRepRange enum.
+     *
+     * - Heavy: { min: 5, max: 15 }
+     * - Medium: { min: 10, max: 20 }
+     * - Light: { min: 15, max: 30 }
+     *
+     * @param repRange The exercise rep range.
+     */
+    static getRepRangeValues(repRange: ExerciseRepRange): {
+        min: number;
+        max: number;
+    };
+    /**
+     * Gets the fatigue score for an exercise.
+     *
+     * @param exercise The exercise to get the fatigue score for.
+     */
+    static getFatigueScore(exercise: WorkoutExercise): number;
+    /**
+     * Calculates the target weight and reps for the FIRST set of an exercise.
+     *
+     * When `previousSets` are provided (completed or planned-only), autoregulation
+     * computes an average surplus across all sets and applies progression. Planned-only
+     * sets are forecasted with surplus = 0 so the plan progresses smoothly without
+     * falling back to calibration.
+     *
+     * When no previous sets exist (first mesocycle or new exercise), the calibration-based
+     * formula computes initial targets from the exercise's 1RM and rep range.
+     */
+    static calculateTargetRepsAndWeightForFirstSet(params: {
+        exercise: WorkoutExercise;
+        calibration: WorkoutExerciseCalibration;
+        equipment: WorkoutEquipmentType;
+        firstMicrocycleRir: number;
+        previousSets: WorkoutSet[];
+    }): {
+        targetWeight: number;
+        targetReps: number;
+    };
+}
+//# sourceMappingURL=WorkoutExercise.service.d.ts.map

package/lib/services/workout/Exercise/WorkoutExercise.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkoutExercise.service.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Exercise/WorkoutExercise.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAEL,gBAAgB,EACjB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,KAAK,EAAuB,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAMhG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;;IACzC;;;;;;;;OAQG;IACH,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;IAWlF;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM;IAIzD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,uCAAuC,CAAC,MAAM,EAAE;QACrD,QAAQ,EAAE,eAAe,CAAC;QAC1B,WAAW,EAAE,0BAA0B,CAAC;QACxC,SAAS,EAAE,oBAAoB,CAAC;QAChC,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,EAAE,UAAU,EAAE,CAAC;KAC5B,GAAG;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;CA6RjD"}

package/lib/services/workout/Exercise/{WorkoutExerciseService.js → WorkoutExercise.service.js}

@@ -1,8 +1,8 @@
 import { ExerciseProgressionType, ExerciseRepRange } from '../../../documents/workout/WorkoutExercise.js';
-import WorkoutEquipmentTypeService from '../EquipmentType/WorkoutEquipmentTypeService.js';
-import WorkoutExerciseCalibrationService from '../ExerciseCalibration/WorkoutExerciseCalibrationService.js';
-import WorkoutSessionExerciseService from '../SessionExercise/WorkoutSessionExerciseService.js';
-import WorkoutSFRService from '../util/SFR/WorkoutSFRService.js';
+import WorkoutEquipmentTypeService from '../EquipmentType/WorkoutEquipmentType.service.js';
+import WorkoutExerciseCalibrationService from '../ExerciseCalibration/WorkoutExerciseCalibration.service.js';
+import WorkoutSessionExerciseService from '../SessionExercise/WorkoutSessionExercise.service.js';
+import WorkoutSFRService from '../util/SFR/WorkoutSFR.service.js';
 /**
  * A service for handling operations related to {@link WorkoutExercise}s.
  */
@@ -59,10 +59,10 @@ export default class WorkoutExerciseService {
         // forecasts by copying planned values into actuals (surplus = 0) so the
         // plan progresses smoothly from the planned baseline.
         const completedSets = previousSets
-            .map((set) => this.toCompletedSet(set))
+            .map((set) => this.#toCompletedSet(set))
             .filter((set) => set !== null);
         if (completedSets.length > 0) {
-            return this.calculateAutoRegulatedTargets({
+            return this.#calculateAutoRegulatedTargets({
                 exercise,
                 equipment,
                 previousSets: completedSets,
@@ -70,7 +70,7 @@ export default class WorkoutExerciseService {
             });
         }
         // Calibration-based formula (no previous set available)
-        return this.calculateCalibrationBasedTargets({
+        return this.#calculateCalibrationBasedTargets({
             exercise,
             calibration,
             equipment,
@@ -85,7 +85,7 @@ export default class WorkoutExerciseService {
      * Previously only the first set's surplus was used, which masked poor performance
      * on later sets (e.g., first set hits target but second set falls far short).
      */
-    static calculateAutoRegulatedTargets(params) {
+    static #calculateAutoRegulatedTargets(params) {
         const { exercise, equipment, previousSets, repRange } = params;
         // The first set is the reference for rep/weight targets (subsequent sets are
         // derived from the first via intra-session fatigue drops).
@@ -94,9 +94,9 @@ export default class WorkoutExerciseService {
         // previousSets are CompletedWorkoutSets (all fields non-null), so this always returns a number.
         const surplus = WorkoutSessionExerciseService.calculateAverageSurplus(previousSets) ?? 0;
         if (exercise.preferredProgressionType === ExerciseProgressionType.Rep) {
-            return this.calculateAutoRegulatedRepTargets(previousFirstSet, surplus, repRange, equipment);
+            return this.#calculateAutoRegulatedRepTargets(previousFirstSet, surplus, repRange, equipment);
         }
-        return this.calculateAutoRegulatedLoadTargets(previousFirstSet, surplus, repRange, equipment);
+        return this.#calculateAutoRegulatedLoadTargets(previousFirstSet, surplus, repRange, equipment);
     }
     /**
      * Auto-regulated rep progression. Attempts to increase reps until hitting rep range max,
@@ -110,7 +110,7 @@ export default class WorkoutExerciseService {
      * | -3 | Regress: actualReps (use actual as new baseline) |
      * | < -3 | Severe regress: actualReps + reduce weight (weight is too heavy for rep range) |
      */
-    static calculateAutoRegulatedRepTargets(previousSet, surplus, repRange, equipment) {
+    static #calculateAutoRegulatedRepTargets(previousSet, surplus, repRange, equipment) {
         let targetReps;
         let targetWeight = previousSet.plannedWeight;
         if (surplus >= 3) {
@@ -140,7 +140,7 @@ export default class WorkoutExerciseService {
         // Handle rep range ceiling: if target exceeds max, reset and bump weight
         if (targetReps > repRange.max) {
             targetReps = Math.floor((repRange.min + repRange.max) / 2);
-            const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+            const nextWeight = this.#findNextTwoPercentWeight(targetWeight, equipment);
             if (nextWeight !== null) {
                 targetWeight = nextWeight;
             }
@@ -162,7 +162,7 @@ export default class WorkoutExerciseService {
      * | -1 to -2 | Hold weight (no increase) |
      * | <= -3 | Reduce weight by minimum equipment increment |
      */
-    static calculateAutoRegulatedLoadTargets(previousSet, surplus, repRange, equipment) {
+    static #calculateAutoRegulatedLoadTargets(previousSet, surplus, repRange, equipment) {
         const targetReps = repRange.max;
         let targetWeight = previousSet.plannedWeight;
         if (surplus >= 2) {
@@ -175,7 +175,7 @@ export default class WorkoutExerciseService {
         }
         else if (surplus >= 0) {
             // Normal: increase by 2%
-            const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+            const nextWeight = this.#findNextTwoPercentWeight(targetWeight, equipment);
             if (nextWeight !== null) {
                 targetWeight = nextWeight;
             }
@@ -201,7 +201,7 @@ export default class WorkoutExerciseService {
      *
      * Returns null if the set lacks the minimum planned data needed.
      */
-    static toCompletedSet(set) {
+    static #toCompletedSet(set) {
         if (!set) {
             return null;
         }
@@ -224,7 +224,7 @@ export default class WorkoutExerciseService {
      * set exists (first microcycle of the first mesocycle, or brand-new exercise).
      * All subsequent microcycle progression is handled by autoregulation/forecasting.
      */
-    static calculateCalibrationBasedTargets(params) {
+    static #calculateCalibrationBasedTargets(params) {
         const { exercise, calibration, equipment, firstMicrocycleRir, repRange, repRangeMidpoint } = params;
         // For rep progression, calculate weight based on midpoint + RIR reps
         // For load progression, use max reps
@@ -243,7 +243,7 @@ export default class WorkoutExerciseService {
             : repRange.max;
         return { targetWeight, targetReps };
     }
-    static findNextTwoPercentWeight(currentWeight, equipment) {
+    static #findNextTwoPercentWeight(currentWeight, equipment) {
         // Increase weight by at least 2%
         const twoPercentIncrease = currentWeight * 1.02;
         // Find the smallest weight >= 2% increase (This is purposefully done from the rounded weight
@@ -252,4 +252,4 @@ export default class WorkoutExerciseService {
         return nextWeight;
     }
 }
-//# sourceMappingURL=WorkoutExerciseService.js.map
+//# sourceMappingURL=WorkoutExercise.service.js.map

package/lib/services/workout/Exercise/WorkoutExercise.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkoutExercise.service.js","sourceRoot":"","sources":["../../../../src/services/workout/Exercise/WorkoutExercise.service.ts"],"names":[],"mappings":"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"}

package/lib/services/workout/Exercise/{WorkoutExerciseService.ts → WorkoutExercise.service.ts}

@@ -6,10 +6,10 @@ import {
 } from '../../../documents/workout/WorkoutExercise.js';
 import type { WorkoutExerciseCalibration } from '../../../documents/workout/WorkoutExerciseCalibration.js';
 import type { CompletedWorkoutSet, WorkoutSet } from '../../../documents/workout/WorkoutSet.js';
-import WorkoutEquipmentTypeService from '../EquipmentType/WorkoutEquipmentTypeService.js';
-import WorkoutExerciseCalibrationService from '../ExerciseCalibration/WorkoutExerciseCalibrationService.js';
-import WorkoutSessionExerciseService from '../SessionExercise/WorkoutSessionExerciseService.js';
-import WorkoutSFRService from '../util/SFR/WorkoutSFRService.js';
+import WorkoutEquipmentTypeService from '../EquipmentType/WorkoutEquipmentType.service.js';
+import WorkoutExerciseCalibrationService from '../ExerciseCalibration/WorkoutExerciseCalibration.service.js';
+import WorkoutSessionExerciseService from '../SessionExercise/WorkoutSessionExercise.service.js';
+import WorkoutSFRService from '../util/SFR/WorkoutSFR.service.js';
 
 /**
  * A service for handling operations related to {@link WorkoutExercise}s.
@@ -80,11 +80,11 @@ export default class WorkoutExerciseService {
     // forecasts by copying planned values into actuals (surplus = 0) so the
     // plan progresses smoothly from the planned baseline.
     const completedSets = previousSets
-      .map((set) => this.toCompletedSet(set))
+      .map((set) => this.#toCompletedSet(set))
       .filter((set): set is CompletedWorkoutSet => set !== null);
 
     if (completedSets.length > 0) {
-      return this.calculateAutoRegulatedTargets({
+      return this.#calculateAutoRegulatedTargets({
         exercise,
         equipment,
         previousSets: completedSets,
@@ -93,7 +93,7 @@ export default class WorkoutExerciseService {
     }
 
     // Calibration-based formula (no previous set available)
-    return this.calculateCalibrationBasedTargets({
+    return this.#calculateCalibrationBasedTargets({
       exercise,
       calibration,
       equipment,
@@ -109,7 +109,7 @@ export default class WorkoutExerciseService {
    * Previously only the first set's surplus was used, which masked poor performance
    * on later sets (e.g., first set hits target but second set falls far short).
    */
-  private static calculateAutoRegulatedTargets(params: {
+  static #calculateAutoRegulatedTargets(params: {
     exercise: WorkoutExercise;
     equipment: WorkoutEquipmentType;
     previousSets: CompletedWorkoutSet[];
@@ -126,10 +126,10 @@ export default class WorkoutExerciseService {
     const surplus = WorkoutSessionExerciseService.calculateAverageSurplus(previousSets) ?? 0;
 
     if (exercise.preferredProgressionType === ExerciseProgressionType.Rep) {
-      return this.calculateAutoRegulatedRepTargets(previousFirstSet, surplus, repRange, equipment);
+      return this.#calculateAutoRegulatedRepTargets(previousFirstSet, surplus, repRange, equipment);
     }
 
-    return this.calculateAutoRegulatedLoadTargets(previousFirstSet, surplus, repRange, equipment);
+    return this.#calculateAutoRegulatedLoadTargets(previousFirstSet, surplus, repRange, equipment);
   }
 
   /**
@@ -144,7 +144,7 @@ export default class WorkoutExerciseService {
    * | -3 | Regress: actualReps (use actual as new baseline) |
    * | < -3 | Severe regress: actualReps + reduce weight (weight is too heavy for rep range) |
    */
-  private static calculateAutoRegulatedRepTargets(
+  static #calculateAutoRegulatedRepTargets(
     previousSet: CompletedWorkoutSet,
     surplus: number,
     repRange: { min: number; max: number },
@@ -182,7 +182,7 @@ export default class WorkoutExerciseService {
     // Handle rep range ceiling: if target exceeds max, reset and bump weight
     if (targetReps > repRange.max) {
       targetReps = Math.floor((repRange.min + repRange.max) / 2);
-      const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+      const nextWeight = this.#findNextTwoPercentWeight(targetWeight, equipment);
       if (nextWeight !== null) {
         targetWeight = nextWeight;
       }
@@ -211,7 +211,7 @@ export default class WorkoutExerciseService {
    * | -1 to -2 | Hold weight (no increase) |
    * | <= -3 | Reduce weight by minimum equipment increment |
    */
-  private static calculateAutoRegulatedLoadTargets(
+  static #calculateAutoRegulatedLoadTargets(
     previousSet: CompletedWorkoutSet,
     surplus: number,
     repRange: { min: number; max: number },
@@ -233,7 +233,7 @@ export default class WorkoutExerciseService {
       }
     } else if (surplus >= 0) {
       // Normal: increase by 2%
-      const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+      const nextWeight = this.#findNextTwoPercentWeight(targetWeight, equipment);
       if (nextWeight !== null) {
         targetWeight = nextWeight;
       }
@@ -263,7 +263,7 @@ export default class WorkoutExerciseService {
    *
    * Returns null if the set lacks the minimum planned data needed.
    */
-  private static toCompletedSet(set?: WorkoutSet): CompletedWorkoutSet | null {
+  static #toCompletedSet(set?: WorkoutSet): CompletedWorkoutSet | null {
     if (!set) {
       return null;
     }
@@ -287,7 +287,7 @@ export default class WorkoutExerciseService {
    * set exists (first microcycle of the first mesocycle, or brand-new exercise).
    * All subsequent microcycle progression is handled by autoregulation/forecasting.
    */
-  private static calculateCalibrationBasedTargets(params: {
+  static #calculateCalibrationBasedTargets(params: {
     exercise: WorkoutExercise;
     calibration: WorkoutExerciseCalibration;
     equipment: WorkoutEquipmentType;
@@ -330,7 +330,7 @@ export default class WorkoutExerciseService {
     return { targetWeight, targetReps };
   }
 
-  private static findNextTwoPercentWeight(
+  static #findNextTwoPercentWeight(
     currentWeight: number,
     equipment: WorkoutEquipmentType
   ): number | null {

package/lib/services/workout/ExerciseCalibration/{WorkoutExerciseCalibrationService.d.ts → WorkoutExerciseCalibration.service.d.ts}

@@ -5,6 +5,7 @@ import type { WorkoutExerciseCalibration } from '../../../documents/workout/Work
  * A service for handling operations related to {@link WorkoutExerciseCalibration}s.
  */
 export default class WorkoutExerciseCalibrationService {
+    #private;
     /**
      * Calculates the 1 Rep Max using the NASM formula.
      *
@@ -73,16 +74,5 @@ export default class WorkoutExerciseCalibrationService {
      * @param dateRecorded The date to use as dateRecorded for new calibrations.
      */
     static generateAutoCalibrations(exerciseCTOs: WorkoutExerciseCTO[], userId: UUID, dateRecorded: Date): WorkoutExerciseCalibration[];
-    /**
-     * Calculates the target percentage of 1RM for a given target rep count.
-     *
-     * Uses the formula: targetPercentage = 85 - ((targetReps - 5) * 2.2)
-     *
-     * This ensures training stays within the 85%-30% 1RM range (5 reps to 30 reps).
-     * Higher rep counts produce lower percentages of 1RM.
-     *
-     * @param targetReps The target number of reps.
-     */
-    private static getTargetPercentage;
 }
-//# sourceMappingURL=WorkoutExerciseCalibrationService.d.ts.map
+//# sourceMappingURL=WorkoutExerciseCalibration.service.d.ts.map

package/lib/services/workout/ExerciseCalibration/WorkoutExerciseCalibration.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkoutExerciseCalibration.service.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/ExerciseCalibration/WorkoutExerciseCalibration.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AAG3G;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iCAAiC;;IAIpD;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,0BAA0B,GAAG,MAAM;IAI9D;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;IAS7D;;;;;;;;OAQG;IACH,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAK3F;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAK/E;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,wBAAwB,CAC7B,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,IAAI,GACjB,0BAA0B,EAAE;CAyChC"}