@dgpholdings/greatoak-shared 1.2.20 → 1.2.22

package/dist/types/TApiExercise.d.ts

@@ -119,6 +119,8 @@ export type TExercise = {
     thumbnailBlurHash?: string;
     instructionsHtml: string;
     importantTipsHtml: string;
+    popularityIndex: number;
+    isFavorite?: boolean;
 };
 export type TBodyPartExercises = Record<TBodyPart, TExercise[]>;
 export type TApiCreateOrUpdateExerciseReq = {

package/dist/utils/index.d.ts

@@ -1,7 +1,6 @@
 export { toNumber } from "./number.util";
 export { mmssToSecs, isUserAllowedToUpdate, getDaysAndHoursDifference, } from "./time.util";
 export { countryToCurrencyCode } from "./billing.utils";
-export { calculateExerciseScore } from "./scoring.utils";
 export { isDefined, isDefinedNumber } from "./isDefined.utils";
 export { slugifyText } from "./slugify.util";
 export { toError } from "./toError.util";

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.calculateTotalVolume = exports.calculateExerciseScoreV2 = exports.NOOP = exports.isEmail = exports.isAnonymousEmail = exports.maskEmail = exports.generatePlanCode = exports.toError = exports.slugifyText = exports.isDefinedNumber = exports.isDefined = 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");
@@ -9,8 +9,6 @@ Object.defineProperty(exports, "isUserAllowedToUpdate", { enumerable: true, get:
 Object.defineProperty(exports, "getDaysAndHoursDifference", { enumerable: true, get: function () { return time_util_1.getDaysAndHoursDifference; } });
 var billing_utils_1 = require("./billing.utils");
 Object.defineProperty(exports, "countryToCurrencyCode", { enumerable: true, get: function () { return billing_utils_1.countryToCurrencyCode; } });
-var scoring_utils_1 = require("./scoring.utils");
-Object.defineProperty(exports, "calculateExerciseScore", { enumerable: true, get: function () { return scoring_utils_1.calculateExerciseScore; } });
 var isDefined_utils_1 = require("./isDefined.utils");
 Object.defineProperty(exports, "isDefined", { enumerable: true, get: function () { return isDefined_utils_1.isDefined; } });
 Object.defineProperty(exports, "isDefinedNumber", { enumerable: true, get: function () { return isDefined_utils_1.isDefinedNumber; } });

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

@@ -55,14 +55,15 @@ interface IRawRecord {
  * @param parsedSets        Cleaned sets (from parseRecords) — only completed sets
  * @param rawRecords        Original TRecord[] — needed for completion count (includes skipped)
  * @param timingGuardrails  Exercise's guardrails — for rest period validation
+ * @param isStrictTimingModeScoring If false, ignores the rest discipline penalty.
  * @returns                 { score: 0–100, breakdown: { completion, consistency, effortAdequacy, restDiscipline } }
  *
  * @example
- * const { score, breakdown } = calculateQualityScore(parsed, raw, guardrails);
+ * const { score, breakdown } = calculateQualityScore(parsed, raw, guardrails, false);
  * // score: 81
- * // breakdown: { completion: 100, consistency: 75, effortAdequacy: 80, restDiscipline: 73 }
+ * // breakdown: { completion: 100, consistency: 75, effortAdequacy: 80, restDiscipline: 65 }
  */
-export declare function calculateQualityScore(parsedSets: IParsedSet[], rawRecords: IRawRecord[], timingGuardrails?: ITimingGuardrails): {
+export declare function calculateQualityScore(parsedSets: IParsedSet[], rawRecords: IRawRecord[], timingGuardrails?: ITimingGuardrails, isStrictTimingModeScoring?: boolean): {
     score: number;
     breakdown: IQualityBreakdown;
 };

package/dist/utils/scoring/calculateQualityScore.js

@@ -13,14 +13,15 @@ const helpers_1 = require("./helpers");
  * @param parsedSets        Cleaned sets (from parseRecords) — only completed sets
  * @param rawRecords        Original TRecord[] — needed for completion count (includes skipped)
  * @param timingGuardrails  Exercise's guardrails — for rest period validation
+ * @param isStrictTimingModeScoring If false, ignores the rest discipline penalty.
  * @returns                 { score: 0–100, breakdown: { completion, consistency, effortAdequacy, restDiscipline } }
  *
  * @example
- * const { score, breakdown } = calculateQualityScore(parsed, raw, guardrails);
+ * const { score, breakdown } = calculateQualityScore(parsed, raw, guardrails, false);
  * // score: 81
- * // breakdown: { completion: 100, consistency: 75, effortAdequacy: 80, restDiscipline: 73 }
+ * // breakdown: { completion: 100, consistency: 75, effortAdequacy: 80, restDiscipline: 65 }
  */
-function calculateQualityScore(parsedSets, rawRecords, timingGuardrails) {
+function calculateQualityScore(parsedSets, rawRecords, timingGuardrails, isStrictTimingModeScoring = false) {
     // Edge case: no records at all
     if (rawRecords.length === 0) {
         return {
@@ -50,7 +51,7 @@ function calculateQualityScore(parsedSets, rawRecords, timingGuardrails) {
     const completion = calculateCompletion(parsedSets, rawRecords);
     const consistency = calculateConsistency(parsedSets);
     const effortAdequacy = calculateEffortAdequacy(rawRecords);
-    const restDiscipline = calculateRestDiscipline(parsedSets, timingGuardrails);
+    const restDiscipline = isStrictTimingModeScoring ? calculateRestDiscipline(parsedSets, timingGuardrails) : constants_1.REST_NO_DATA_SCORE; // 65 by default if not strict
     const score = Math.round(completion * constants_1.QUALITY_WEIGHTS.completion +
         consistency * constants_1.QUALITY_WEIGHTS.consistency +
         effortAdequacy * constants_1.QUALITY_WEIGHTS.effortAdequacy +
@@ -267,11 +268,11 @@ function scoreAgainstRange(value, range) {
  *
  * Uses the exercise's timingGuardrails.restPeriods:
  *   optimalRange [min, max] → 100 points
- *   within [minimum, maximum] → 60–100 (proportional to how close to optimal)
- *   outside [minimum, maximum] → 30 points
+ *   within [minimum, maximum] → 70–100 (proportional to how close to optimal)
+ *   outside [minimum, maximum] → 50 points (Reduced penalty so it doesn't tank the score too much)
  *
  * Only scores sets that HAVE rest data (last set often doesn't).
- * If no valid rest data exists at all → neutral 65.
+ * If no valid rest data exists at all → neutral 70.
  *
  * The stressRestBonus from timingGuardrails is applied as a final multiplier:
  * exercises where proper rest is especially important (heavy compounds)
@@ -282,7 +283,7 @@ function calculateRestDiscipline(parsedSets, timingGuardrails) {
     // Gather sets that have rest data (non-null)
     const setsWithRest = parsedSets.filter((s) => s.restDurationSecs !== null);
     if (setsWithRest.length === 0)
-        return constants_1.REST_NO_DATA_SCORE;
+        return 70; // Increased from REST_NO_DATA_SCORE (which was likely lower)
     // Extract rest period bounds from guardrails
     const restConfig = timingGuardrails === null || timingGuardrails === void 0 ? void 0 : timingGuardrails.restPeriods;
     const optimalMin = (_b = (_a = restConfig === null || restConfig === void 0 ? void 0 : restConfig.optimalRange) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : ((_c = restConfig === null || restConfig === void 0 ? void 0 : restConfig.typical) !== null && _c !== void 0 ? _c : constants_1.FALLBACK_REST_SECS) * 0.75;
@@ -294,11 +295,12 @@ function calculateRestDiscipline(parsedSets, timingGuardrails) {
         const rest = set.restDurationSecs; // Guaranteed non-null by filter
         if (rest >= optimalMin && rest <= optimalMax) {
             // Within optimal range → perfect score
-            setScores.push(constants_1.REST_OPTIMAL_SCORE);
+            setScores.push(100); // REST_OPTIMAL_SCORE
         }
         else if (rest >= acceptableMin && rest <= acceptableMax) {
             // Within acceptable range but not optimal
-            // Score proportionally based on how close to optimal
+            // Score proportionally based on how close to optimal, base is 70 now
+            const baseAcceptableScore = 70;
             let ratio;
             if (rest < optimalMin) {
                 // Between acceptable min and optimal min
@@ -308,12 +310,12 @@ function calculateRestDiscipline(parsedSets, timingGuardrails) {
                 // Between optimal max and acceptable max
                 ratio = (acceptableMax - rest) / (acceptableMax - optimalMax);
             }
-            setScores.push(constants_1.REST_ACCEPTABLE_BASE +
-                ratio * (constants_1.REST_OPTIMAL_SCORE - constants_1.REST_ACCEPTABLE_BASE));
+            setScores.push(baseAcceptableScore +
+                ratio * (100 - baseAcceptableScore));
         }
         else {
-            // Outside even the acceptable range
-            setScores.push(constants_1.REST_OUTSIDE_SCORE);
+            // Outside even the acceptable range, reduced penalty to 50
+            setScores.push(50);
         }
     }
     // Average rest scores

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

@@ -184,8 +184,8 @@ export declare const EFFORT_NO_DATA_SCORE = 70;
 /** Score when rest is within the optimal range */
 export declare const REST_OPTIMAL_SCORE = 100;
 /** Score when rest is within acceptable (min–max) but not optimal */
-export declare const REST_ACCEPTABLE_BASE = 60;
+export declare const REST_ACCEPTABLE_BASE = 70;
 /** Score when rest is completely outside the acceptable range */
-export declare const REST_OUTSIDE_SCORE = 30;
+export declare const REST_OUTSIDE_SCORE = 50;
 /** Default rest discipline score when no valid rest data exists */
-export declare const REST_NO_DATA_SCORE = 65;
+export declare const REST_NO_DATA_SCORE = 75;

package/dist/utils/scoring/constants.js

@@ -220,8 +220,8 @@ exports.EFFORT_NO_DATA_SCORE = 70;
 /** Score when rest is within the optimal range */
 exports.REST_OPTIMAL_SCORE = 100;
 /** Score when rest is within acceptable (min–max) but not optimal */
-exports.REST_ACCEPTABLE_BASE = 60;
+exports.REST_ACCEPTABLE_BASE = 70;
 /** Score when rest is completely outside the acceptable range */
-exports.REST_OUTSIDE_SCORE = 30;
+exports.REST_OUTSIDE_SCORE = 50;
 /** Default rest discipline score when no valid rest data exists */
-exports.REST_NO_DATA_SCORE = 65;
+exports.REST_NO_DATA_SCORE = 75;

package/package.json

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