@dgpholdings/greatoak-shared 1.2.19 → 1.2.20

package/dist/utils/index.d.ts

@@ -8,4 +8,4 @@ export { toError } from "./toError.util";
 export { generatePlanCode } from "./planCode.util";
 export { maskEmail, isAnonymousEmail, isEmail } from "./email.utils";
 export { NOOP } from "./noop.utils";
-export { calculateExerciseScoreV2 } from "./scoring";
+export { calculateExerciseScoreV2, calculateTotalVolume } from "./scoring";

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateExerciseScoreV2 = exports.NOOP = exports.isEmail = exports.isAnonymousEmail = exports.maskEmail = exports.generatePlanCode = exports.toError = exports.slugifyText = exports.isDefinedNumber = exports.isDefined = exports.calculateExerciseScore = exports.countryToCurrencyCode = exports.getDaysAndHoursDifference = exports.isUserAllowedToUpdate = exports.mmssToSecs = exports.toNumber = void 0;
+exports.calculateTotalVolume = exports.calculateExerciseScoreV2 = exports.NOOP = exports.isEmail = exports.isAnonymousEmail = exports.maskEmail = exports.generatePlanCode = exports.toError = exports.slugifyText = exports.isDefinedNumber = exports.isDefined = exports.calculateExerciseScore = exports.countryToCurrencyCode = exports.getDaysAndHoursDifference = exports.isUserAllowedToUpdate = exports.mmssToSecs = exports.toNumber = void 0;
 var number_util_1 = require("./number.util");
 Object.defineProperty(exports, "toNumber", { enumerable: true, get: function () { return number_util_1.toNumber; } });
 var time_util_1 = require("./time.util");
@@ -28,3 +28,4 @@ var noop_utils_1 = require("./noop.utils");
 Object.defineProperty(exports, "NOOP", { enumerable: true, get: function () { return noop_utils_1.NOOP; } });
 var scoring_1 = require("./scoring");
 Object.defineProperty(exports, "calculateExerciseScoreV2", { enumerable: true, get: function () { return scoring_1.calculateExerciseScoreV2; } });
+Object.defineProperty(exports, "calculateTotalVolume", { enumerable: true, get: function () { return scoring_1.calculateTotalVolume; } });

package/dist/utils/scoring/calculateTotalVolume.d.ts

@@ -0,0 +1,11 @@
+import { TRecord, TUserMetric } from "../../types";
+/**
+ * Calculates total volume for a set of records.
+ *
+ * - weight-reps: reps * weight
+ * - reps-only: reps * (auxWeight || 30% of bodyweight)
+ * - duration: durationSecs * 10 * (1 + auxWeight/100)
+ * - cardio-machine: distance (m) * (1 + avgSpeed/20)
+ * - cardio-free: distance (m) * (1 + speed/20)
+ */
+export declare const calculateTotalVolume: (record: TRecord[], user: TUserMetric) => number;

package/dist/utils/scoring/calculateTotalVolume.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateTotalVolume = void 0;
+const time_util_1 = require("../time.util");
+/**
+ * Calculates total volume for a set of records.
+ *
+ * - weight-reps: reps * weight
+ * - reps-only: reps * (auxWeight || 30% of bodyweight)
+ * - duration: durationSecs * 10 * (1 + auxWeight/100)
+ * - cardio-machine: distance (m) * (1 + avgSpeed/20)
+ * - cardio-free: distance (m) * (1 + speed/20)
+ */
+const calculateTotalVolume = (record, user) => {
+    return record.reduce((total, set) => {
+        const weight = parseFloat(set.type === "weight-reps"
+            ? set.kg
+            : set.type === "duration" || set.type === "reps-only"
+                ? set.auxWeightKg
+                : "0") || 0;
+        const reps = parseFloat(set.type === "weight-reps" || set.type === "reps-only" ? set.reps : "0") || 0;
+        const duration = set.type === "duration" ||
+            set.type === "cardio-machine" ||
+            set.type === "cardio-free"
+            ? (0, time_util_1.mmssToSecs)(set.durationMmSs)
+            : 0;
+        if (set.type === "weight-reps") {
+            return total + reps * weight;
+        }
+        else if (set.type === "reps-only") {
+            const bodyweight = user.weightKg || 70;
+            const effectiveWeight = weight > 0 ? weight : bodyweight * 0.3;
+            return total + reps * effectiveWeight;
+        }
+        else if (set.type === "duration") {
+            const weightFactor = weight > 0 ? 1 + weight / 100 : 1;
+            return total + duration * 10 * weightFactor;
+        }
+        else if (set.type === "cardio-machine") {
+            const avgSpeed = (parseFloat(set.speedMin) + parseFloat(set.speedMax)) / 2 || 10;
+            const distance = parseFloat(set.distance || "0") || (avgSpeed * duration) / 3600;
+            return total + distance * 1000 * (1 + avgSpeed / 20);
+        }
+        else if (set.type === "cardio-free") {
+            const distance = parseFloat(set.distance) || 0;
+            const speed = distance / (duration / 3600);
+            return total + distance * 1000 * (1 + speed / 20);
+        }
+        return total;
+    }, 0);
+};
+exports.calculateTotalVolume = calculateTotalVolume;

package/dist/utils/scoring/index.d.ts

@@ -14,6 +14,7 @@
  * interface expects.
  */
 import { TExercise, TRecord, TUserMetric } from "../../types";
+export { calculateTotalVolume } from "./calculateTotalVolume";
 interface IScoreResult {
     score: number;
     muscleScores: {
@@ -25,4 +26,3 @@ export declare const calculateExerciseScoreV2: (param: {
     record: TRecord[];
     user: TUserMetric;
 }) => IScoreResult;
-export {};

package/dist/utils/scoring/index.js

@@ -15,11 +15,13 @@
  * interface expects.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateExerciseScoreV2 = void 0;
+exports.calculateExerciseScoreV2 = exports.calculateTotalVolume = void 0;
 const calculateMuscleFatiue_1 = require("./calculateMuscleFatiue");
 const calculateQualityScore_1 = require("./calculateQualityScore");
 const helpers_1 = require("./helpers");
 const parseRecords_1 = require("./parseRecords");
+var calculateTotalVolume_1 = require("./calculateTotalVolume");
+Object.defineProperty(exports, "calculateTotalVolume", { enumerable: true, get: function () { return calculateTotalVolume_1.calculateTotalVolume; } });
 // ---------------------------------------------------------------------------
 // Main Function — existing signature
 // ---------------------------------------------------------------------------

package/dist/utils/scoring.utils.d.ts

@@ -11,5 +11,4 @@ export declare const calculateExerciseScore: (param: {
     user: TUserMetric;
     isStrictTimingModeScoring: boolean;
 }) => IScoreResult;
-export declare const calculateTotalVolume: (record: TRecord[], user: TUserMetric) => number;
 export {};

package/dist/utils/scoring.utils.js

@@ -42,8 +42,9 @@
  * - Fatigue multiplier (later sets get 8% bonus per set for accumulated fatigue)
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateTotalVolume = exports.calculateExerciseScore = void 0;
+exports.calculateExerciseScore = void 0;
 const time_util_1 = require("./time.util");
+const scoring_1 = require("./scoring");
 const calculateExerciseScore = (param) => {
     const { exercise, record, user } = param;
     // Filter only completed sets
@@ -52,7 +53,7 @@ const calculateExerciseScore = (param) => {
         return { score: 0, muscleScores: {} };
     }
     // Calculate base performance metrics
-    const totalVolume = (0, exports.calculateTotalVolume)(completedSets, user);
+    const totalVolume = (0, scoring_1.calculateTotalVolume)(completedSets, user);
     const avgIntensity = calculateAverageIntensity(completedSets, exercise, user);
     const setQuality = calculateSetQuality(completedSets);
     // Calculate muscle fatigue scores
@@ -68,45 +69,6 @@ const calculateExerciseScore = (param) => {
     };
 };
 exports.calculateExerciseScore = calculateExerciseScore;
-const calculateTotalVolume = (record, user) => {
-    return record.reduce((total, set) => {
-        const weight = parseFloat(set.type === "weight-reps"
-            ? set.kg
-            : set.type === "duration" || set.type === "reps-only"
-                ? set.auxWeightKg
-                : "0") || 0;
-        const reps = parseFloat(set.type === "weight-reps" || set.type === "reps-only" ? set.reps : "0") || 0;
-        const duration = set.type === "duration" ||
-            set.type === "cardio-machine" ||
-            set.type === "cardio-free"
-            ? (0, time_util_1.mmssToSecs)(set.durationMmSs)
-            : 0;
-        if (set.type === "weight-reps") {
-            return total + reps * weight;
-        }
-        else if (set.type === "reps-only") {
-            const bodyweight = user.weightKg || 70;
-            const effectiveWeight = weight > 0 ? weight : bodyweight * 0.3;
-            return total + reps * effectiveWeight;
-        }
-        else if (set.type === "duration") {
-            const weightFactor = weight > 0 ? 1 + weight / 100 : 1;
-            return total + duration * 10 * weightFactor;
-        }
-        else if (set.type === "cardio-machine") {
-            const avgSpeed = (parseFloat(set.speedMin) + parseFloat(set.speedMax)) / 2 || 10;
-            const distance = parseFloat(set.distance || "0") || (avgSpeed * duration) / 3600;
-            return total + distance * 1000 * (1 + avgSpeed / 20);
-        }
-        else if (set.type === "cardio-free") {
-            const distance = parseFloat(set.distance) || 0;
-            const speed = distance / (duration / 3600);
-            return total + distance * 1000 * (1 + speed / 20);
-        }
-        return total;
-    }, 0);
-};
-exports.calculateTotalVolume = calculateTotalVolume;
 const calculateAverageIntensity = (record, exercise, user) => {
     const intensities = record.map((set, index) => {
         let baseIntensity = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dgpholdings/greatoak-shared",
-	"version": "1.2.19",
+	"version": "1.2.20",
 	"description": "Shared TypeScript types and utilities for @dgpholdings projects",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",