@dgpholdings/greatoak-shared 1.1.59 → 1.1.61

package/dist/types/TApiRecord.d.ts

@@ -1,43 +1,61 @@
-export type TRecord = {
-    type: "weight-reps";
-    kg: string;
-    reps: string;
-} | {
-    type: "duration";
-    durationSecs: string;
-    goalDuration: string;
-} | {
-    type: "reps-only";
-    reps: string;
-};
+export type TRecord =
+  | {
+      type: "weight-reps";
+      kg: string;
+      reps: string;
+    }
+  | {
+      type: "duration";
+      durationMmSs: string;
+      goalDuration: string;
+    }
+  | {
+      type: "reps-only";
+      reps: string;
+    };
 export type TRecordForm = TRecord & {
-    isDone: boolean;
+  isDone: boolean;
 };
-export type TRecordDuration = Extract<TRecord, {
+export type TRecordDuration = Extract<
+  TRecord,
+  {
     type: "duration";
-}>;
-export type TRecordWeight = Extract<TRecord, {
+  }
+>;
+export type TRecordWeight = Extract<
+  TRecord,
+  {
     type: "weight-reps";
-}>;
-export type TRecordBodyWeight = Extract<TRecord, {
+  }
+>;
+export type TRecordBodyWeight = Extract<
+  TRecord,
+  {
     type: "reps-only";
-}>;
+  }
+>;
 export type TExerciseRecord<T extends TRecord["type"]> = {
-    exerciseId: string;
-    userId: string;
-    recordType: T;
-    records: {
-        isoDate: string;
-        records: Omit<Extract<TRecord, {
-            type: T;
-        }>, "type">[];
-    }[];
+  exerciseId: string;
+  userId: string;
+  recordType: T;
+  records: {
+    isoDate: string;
+    records: Omit<
+      Extract<
+        TRecord,
+        {
+          type: T;
+        }
+      >,
+      "type"
+    >[];
+  }[];
 };
 export type TApiExerciseRecordUpdateReq = {
-    exerciseId: string;
-    recordType: TRecord["type"];
-    records: TExerciseRecord<TRecord["type"]>["records"][number]["records"];
+  exerciseId: string;
+  recordType: TRecord["type"];
+  records: TExerciseRecord<TRecord["type"]>["records"][number]["records"];
 };
 export type TApiExerciseRecordUpdateRes = {
-    status: 201 | 400;
+  status: 201 | 400;
 };

package/dist/types/TApiTemplateData.d.ts

@@ -57,13 +57,13 @@ export type TExerciseLatestRecord = {
     records: {
         kg?: string;
         reps?: string;
-        durationSecs?: string;
+        durationMmSs?: string;
         auxWeightKg?: string;
         isDone: boolean;
         rpe?: string;
         rir?: string;
         setNote?: string;
-        distanceKm?: string;
+        distance?: string;
         isStrictMode: boolean;
         workDurationSecs?: number;
         restDurationSecs?: number;

package/dist/types/TApiUserData.d.ts

@@ -1,26 +1,26 @@
 import { TExercise } from "./TApiExercise";
 import { TTemplate } from "./TApiTemplate";
 type TExerciseRecord = {
-    recordDate: Date;
-    exerciseNote?: string;
-    score: number;
-    records: {
-        kg?: number;
-        reps?: number;
-        durationSecs?: string;
-        goalDuration?: string;
-    }[];
+  recordDate: Date;
+  exerciseNote?: string;
+  score: number;
+  records: {
+    kg?: number;
+    reps?: number;
+    durationMmSs?: string;
+    goalDuration?: string;
+  }[];
 };
 type TTemplateData = Omit<TTemplate, "exerciseIds"> & {
-    exercises: {
-        exercise: TExercise;
-        latestRecord: TExerciseRecord;
-    }[];
+  exercises: {
+    exercise: TExercise;
+    latestRecord: TExerciseRecord;
+  }[];
 };
 export type TApiUserDataRes = {
-    status: number;
-    templates: TTemplateData[];
-    msg?: string;
+  status: number;
+  templates: TTemplateData[];
+  msg?: string;
 };
 export type TApiUserDataReq = {};
 export {};

package/dist/types/commonTypes.d.ts

@@ -12,7 +12,7 @@ export type TRecord = {
     rir?: string;
 } | {
     type: "duration";
-    durationSecs: string;
+    durationMmSs: string;
     auxWeightKg: string;
 } | {
     type: "reps-only";
@@ -23,12 +23,12 @@ export type TRecord = {
     type: "cardio-machine";
     speedMin: string;
     speedMax: string;
-    durationSecs: string;
-    distanceKm?: string;
+    durationMmSs: string;
+    distance?: string;
 } | {
     type: "cardio-free";
-    distanceKm: string;
-    durationSecs: string;
+    distance: string;
+    durationMmSs: string;
 });
 export type TRecordDuration = Extract<TRecord, {
     type: "duration";

package/dist/utils/index.d.ts

@@ -1,10 +1,5 @@
 export { toNumber } from "./number.util";
 export { mmssToSecs, isUserAllowedToUpdate, getDaysAndHoursDifference, } from "./time.util";
 export { countryToCurrencyCode } from "./billing.utils";
-export { computeScoreFromRecord } from "./scoring.utils";
+export { calculateExerciseScore } from "./scoring.utils";
 export { isDefined, isDefinedNumber } from "./isDefined.utils";
-export { refineRecordEntry } from "./record.utils";
-export { generateWorkoutSummaryText, calculateWorkoutSummary, } from "./workoutSummary.util";
-export type { TRefinedRecord, TRefinedBodyWeightRecord, TRefinedDurationRecord, TRefinedWeightRecord, } from "./record.utils";
-export type { TUserProfile, TScoreBreakdown } from "./scoring.utils";
-export type { TWorkoutSummary, TExerciseSummary, TSetSummary, TMuscleRecoveryMap, } from "./workoutSummary.util";

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateWorkoutSummary = exports.generateWorkoutSummaryText = exports.refineRecordEntry = exports.isDefinedNumber = exports.isDefined = exports.computeScoreFromRecord = exports.countryToCurrencyCode = exports.getDaysAndHoursDifference = exports.isUserAllowedToUpdate = exports.mmssToSecs = exports.toNumber = void 0;
+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");
@@ -10,12 +10,7 @@ Object.defineProperty(exports, "getDaysAndHoursDifference", { enumerable: true,
 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, "computeScoreFromRecord", { enumerable: true, get: function () { return scoring_utils_1.computeScoreFromRecord; } });
+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; } });
-var record_utils_1 = require("./record.utils");
-Object.defineProperty(exports, "refineRecordEntry", { enumerable: true, get: function () { return record_utils_1.refineRecordEntry; } });
-var workoutSummary_util_1 = require("./workoutSummary.util");
-Object.defineProperty(exports, "generateWorkoutSummaryText", { enumerable: true, get: function () { return workoutSummary_util_1.generateWorkoutSummaryText; } });
-Object.defineProperty(exports, "calculateWorkoutSummary", { enumerable: true, get: function () { return workoutSummary_util_1.calculateWorkoutSummary; } });

package/dist/utils/record.utils.d.ts

@@ -1,43 +1,48 @@
 import { TRecord } from "../types";
 type RefinedBase = {
-    isDone: boolean;
-    rpe?: number;
-    workDurationSecs?: number;
-    restDurationSecs?: number;
-    setNote?: string;
-    isStrictMode: boolean;
+  isDone: boolean;
+  rpe?: number;
+  workDurationSecs?: number;
+  restDurationSecs?: number;
+  setNote?: string;
+  isStrictMode: boolean;
 };
 export type TRefinedWeightRecord = RefinedBase & {
-    type: "weight-reps";
-    kg: number;
-    reps: number;
-    rir?: number;
+  type: "weight-reps";
+  kg: number;
+  reps: number;
+  rir?: number;
 };
 export type TRefinedDurationRecord = RefinedBase & {
-    type: "duration";
-    durationSecs: number;
-    auxWeightKg: number;
+  type: "duration";
+  durationMmSs: number;
+  auxWeightKg: number;
 };
 export type TRefinedBodyWeightRecord = RefinedBase & {
-    type: "reps-only";
-    reps: number;
-    auxWeightKg: number;
-    rir?: number;
+  type: "reps-only";
+  reps: number;
+  auxWeightKg: number;
+  rir?: number;
 };
 export type TRefinedCardioMachineRecord = RefinedBase & {
-    type: "cardio-machine";
-    speed: number;
-    durationSecs: number;
-    distance: number;
-    intensityScore?: number;
+  type: "cardio-machine";
+  speed: number;
+  durationMmSs: number;
+  distance: number;
+  intensityScore?: number;
 };
 export type TRefinedCardioFreeRecord = RefinedBase & {
-    type: "cardio-free";
-    distanceKm: number;
-    durationSecs: number;
-    avgPaceSecsPerKm?: number;
-    avgSpeedKmh?: number;
+  type: "cardio-free";
+  distance: number;
+  durationMmSs: number;
+  avgPaceSecsPerKm?: number;
+  avgSpeedKmh?: number;
 };
-export type TRefinedRecord = TRefinedWeightRecord | TRefinedDurationRecord | TRefinedBodyWeightRecord | TRefinedCardioMachineRecord | TRefinedCardioFreeRecord;
+export type TRefinedRecord =
+  | TRefinedWeightRecord
+  | TRefinedDurationRecord
+  | TRefinedBodyWeightRecord
+  | TRefinedCardioMachineRecord
+  | TRefinedCardioFreeRecord;
 export declare const refineRecordEntry: (entry: TRecord) => TRefinedRecord;
 export {};

package/dist/utils/record.utils.js

@@ -5,50 +5,149 @@ const isDefined_utils_1 = require("./isDefined.utils");
 const number_util_1 = require("./number.util");
 const time_util_1 = require("./time.util");
 const refineRecordEntry = (entry) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    const base = Object.assign(Object.assign(Object.assign(Object.assign({ isDone: entry.isDone, isStrictMode: entry.isStrictMode }, ((0, isDefined_utils_1.isDefinedNumber)((0, number_util_1.toNumber)(entry.rpe)) && { rpe: (0, number_util_1.toNumber)(entry.rpe) })), ((0, isDefined_utils_1.isDefinedNumber)(entry.workDurationSecs) && {
-        workDurationSecs: entry.workDurationSecs,
-    })), ((0, isDefined_utils_1.isDefinedNumber)(entry.restDurationSecs) && {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+  const base = Object.assign(
+    Object.assign(
+      Object.assign(
+        Object.assign(
+          { isDone: entry.isDone, isStrictMode: entry.isStrictMode },
+          (0, isDefined_utils_1.isDefinedNumber)(
+            (0, number_util_1.toNumber)(entry.rpe)
+          ) && { rpe: (0, number_util_1.toNumber)(entry.rpe) }
+        ),
+        (0, isDefined_utils_1.isDefinedNumber)(entry.workDurationSecs) && {
+          workDurationSecs: entry.workDurationSecs,
+        }
+      ),
+      (0, isDefined_utils_1.isDefinedNumber)(entry.restDurationSecs) && {
         restDurationSecs: entry.restDurationSecs,
-    })), ((0, isDefined_utils_1.isDefined)(entry.setNote) && { setNote: entry.setNote }));
-    if (entry.type === "weight-reps") {
-        return Object.assign(Object.assign({}, base), { type: "weight-reps", kg: (_a = (0, number_util_1.toNumber)(entry.kg)) !== null && _a !== void 0 ? _a : 0, reps: (_b = (0, number_util_1.toNumber)(entry.reps)) !== null && _b !== void 0 ? _b : 0, rir: (0, isDefined_utils_1.isDefinedNumber)((0, number_util_1.toNumber)(entry.rir))
-                ? (0, number_util_1.toNumber)(entry.rir)
-                : undefined });
+      }
+    ),
+    (0, isDefined_utils_1.isDefined)(entry.setNote) && {
+      setNote: entry.setNote,
     }
-    if (entry.type === "duration") {
-        return Object.assign(Object.assign({}, base), { type: "duration", durationSecs: (_c = (0, number_util_1.toNumber)(entry.durationSecs)) !== null && _c !== void 0 ? _c : 0, auxWeightKg: (_d = (0, number_util_1.toNumber)(entry.auxWeightKg)) !== null && _d !== void 0 ? _d : 0 });
-    }
-    if (entry.type === "reps-only") {
-        return Object.assign(Object.assign({}, base), { type: "reps-only", reps: (_e = (0, number_util_1.toNumber)(entry.reps)) !== null && _e !== void 0 ? _e : 0, auxWeightKg: (_f = (0, number_util_1.toNumber)(entry.auxWeightKg)) !== null && _f !== void 0 ? _f : 0, rir: (0, isDefined_utils_1.isDefinedNumber)((0, number_util_1.toNumber)(entry.rir))
-                ? (0, number_util_1.toNumber)(entry.rir)
-                : undefined });
-    }
-    if (entry.type === "cardio-machine") {
-        const speed = (_g = (0, number_util_1.toNumber)(entry.speedMax)) !== null && _g !== void 0 ? _g : 1;
-        const resistance = (_h = (0, number_util_1.toNumber)(entry.rpe)) !== null && _h !== void 0 ? _h : 1;
-        const durationSecs = (_j = (0, number_util_1.toNumber)((0, time_util_1.mmssToSecs)(entry.durationSecs))) !== null && _j !== void 0 ? _j : 0; // entry.durationSecs comes as mm:ss value naming issue
-        const distance = (_k = (0, number_util_1.toNumber)(entry.distanceKm)) !== null && _k !== void 0 ? _k : 1;
-        // Calculate intensity score for progress tracking
-        const intensityScore = speed > 0 && resistance > 0 ? speed * resistance : undefined;
-        return Object.assign(Object.assign(Object.assign({}, base), { type: "cardio-machine", speed,
-            distance,
-            durationSecs }), ((0, isDefined_utils_1.isDefinedNumber)(intensityScore) && { intensityScore }));
-    }
-    if (entry.type === "cardio-free") {
-        const distanceKm = (_l = (0, number_util_1.toNumber)(entry.distanceKm)) !== null && _l !== void 0 ? _l : 0;
-        const durationSecs = (_m = (0, number_util_1.toNumber)(entry.durationSecs)) !== null && _m !== void 0 ? _m : 0;
-        // Calculate pace (seconds per km)
-        const avgPaceSecsPerKm = distanceKm > 0 && durationSecs > 0
-            ? durationSecs / distanceKm
-            : undefined;
-        // Calculate average speed (km/h)
-        const avgSpeedKmh = distanceKm > 0 && durationSecs > 0
-            ? distanceKm / (durationSecs / 3600)
-            : undefined;
-        return Object.assign(Object.assign(Object.assign(Object.assign({}, base), { type: "cardio-free", distanceKm,
-            durationSecs }), ((0, isDefined_utils_1.isDefinedNumber)(avgPaceSecsPerKm) && { avgPaceSecsPerKm })), ((0, isDefined_utils_1.isDefinedNumber)(avgSpeedKmh) && { avgSpeedKmh }));
-    }
-    throw new Error(`Unknown record type: ${entry.type}`);
+  );
+  if (entry.type === "weight-reps") {
+    return Object.assign(Object.assign({}, base), {
+      type: "weight-reps",
+      kg:
+        (_a = (0, number_util_1.toNumber)(entry.kg)) !== null && _a !== void 0
+          ? _a
+          : 0,
+      reps:
+        (_b = (0, number_util_1.toNumber)(entry.reps)) !== null && _b !== void 0
+          ? _b
+          : 0,
+      rir: (0, isDefined_utils_1.isDefinedNumber)(
+        (0, number_util_1.toNumber)(entry.rir)
+      )
+        ? (0, number_util_1.toNumber)(entry.rir)
+        : undefined,
+    });
+  }
+  if (entry.type === "duration") {
+    return Object.assign(Object.assign({}, base), {
+      type: "duration",
+      durationMmSs:
+        (_c = (0, number_util_1.toNumber)(entry.durationMmSs)) !== null &&
+        _c !== void 0
+          ? _c
+          : 0,
+      auxWeightKg:
+        (_d = (0, number_util_1.toNumber)(entry.auxWeightKg)) !== null &&
+        _d !== void 0
+          ? _d
+          : 0,
+    });
+  }
+  if (entry.type === "reps-only") {
+    return Object.assign(Object.assign({}, base), {
+      type: "reps-only",
+      reps:
+        (_e = (0, number_util_1.toNumber)(entry.reps)) !== null && _e !== void 0
+          ? _e
+          : 0,
+      auxWeightKg:
+        (_f = (0, number_util_1.toNumber)(entry.auxWeightKg)) !== null &&
+        _f !== void 0
+          ? _f
+          : 0,
+      rir: (0, isDefined_utils_1.isDefinedNumber)(
+        (0, number_util_1.toNumber)(entry.rir)
+      )
+        ? (0, number_util_1.toNumber)(entry.rir)
+        : undefined,
+    });
+  }
+  if (entry.type === "cardio-machine") {
+    const speed =
+      (_g = (0, number_util_1.toNumber)(entry.speedMax)) !== null &&
+      _g !== void 0
+        ? _g
+        : 1;
+    const resistance =
+      (_h = (0, number_util_1.toNumber)(entry.rpe)) !== null && _h !== void 0
+        ? _h
+        : 1;
+    const durationMmSs =
+      (_j = (0, number_util_1.toNumber)(
+        (0, time_util_1.mmssToSecs)(entry.durationMmSs)
+      )) !== null && _j !== void 0
+        ? _j
+        : 0; // entry.durationMmSs comes as mm:ss value naming issue
+    const distance =
+      (_k = (0, number_util_1.toNumber)(entry.distance)) !== null &&
+      _k !== void 0
+        ? _k
+        : 1;
+    // Calculate intensity score for progress tracking
+    const intensityScore =
+      speed > 0 && resistance > 0 ? speed * resistance : undefined;
+    return Object.assign(
+      Object.assign(Object.assign({}, base), {
+        type: "cardio-machine",
+        speed,
+        distance,
+        durationMmSs,
+      }),
+      (0, isDefined_utils_1.isDefinedNumber)(intensityScore) && {
+        intensityScore,
+      }
+    );
+  }
+  if (entry.type === "cardio-free") {
+    const distance =
+      (_l = (0, number_util_1.toNumber)(entry.distance)) !== null &&
+      _l !== void 0
+        ? _l
+        : 0;
+    const durationMmSs =
+      (_m = (0, number_util_1.toNumber)(entry.durationMmSs)) !== null &&
+      _m !== void 0
+        ? _m
+        : 0;
+    // Calculate pace (seconds per km)
+    const avgPaceSecsPerKm =
+      distance > 0 && durationMmSs > 0 ? durationMmSs / distance : undefined;
+    // Calculate average speed (km/h)
+    const avgSpeedKmh =
+      distance > 0 && durationMmSs > 0
+        ? distance / (durationMmSs / 3600)
+        : undefined;
+    return Object.assign(
+      Object.assign(
+        Object.assign(Object.assign({}, base), {
+          type: "cardio-free",
+          distance,
+          durationMmSs,
+        }),
+        (0, isDefined_utils_1.isDefinedNumber)(avgPaceSecsPerKm) && {
+          avgPaceSecsPerKm,
+        }
+      ),
+      (0, isDefined_utils_1.isDefinedNumber)(avgSpeedKmh) && { avgSpeedKmh }
+    );
+  }
+  throw new Error(`Unknown record type: ${entry.type}`);
 };
 exports.refineRecordEntry = refineRecordEntry;

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

@@ -1,38 +1,14 @@
-import { TRefinedRecord } from "./record.utils";
-import { TExercise, TGender, TFitnessGoal, TUserMetric } from "../types";
-export type TUserProfile = {
-    age?: number;
-    gender?: TGender;
-    weightKg?: number;
-    heightCm?: number;
-    bodyFatPercentage?: number;
-    fitnessLevel?: TUserMetric["fitnessLevel"];
-    fitnessGoal?: TFitnessGoal;
-};
-export type TScoreBreakdown = {
-    baseScore: number;
-    plus: {
-        [reason: string]: number;
-    }[];
-    minus: {
-        [reason: string]: number;
-    }[];
-    finalScore: number;
-    caloriesBurned: number;
-    metValue: number;
-    epocCalories: number;
-};
-type TParams = {
-    record: TRefinedRecord;
+import { TExercise, TRecord, TUserMetric } from "../types";
+interface IScoreResult {
+    score: number;
+    muscleScores: {
+        [muscleGroup: string]: number;
+    };
+}
+export declare const calculateExerciseScore: (param: {
     exercise: TExercise;
-    userProfile?: TUserProfile;
-    avgRestDurationSecs?: number;
-    isTimeIntervalModeEnabled?: boolean;
-};
-/**
- * Enhanced training stress score computation using metabolic data and timing guardrails
- * This is for scoring a SINGLE record of an exercise. Ref: TRecord, TRefinedRecord.
- * To calculate complete scoring/summary of workout use: calculateWorkoutSummary(...) function
- */
-export declare const computeScoreFromRecord: ({ avgRestDurationSecs, record, exercise, userProfile, isTimeIntervalModeEnabled, }: TParams) => TScoreBreakdown;
+    record: TRecord[];
+    user: TUserMetric;
+    isStrictTimingModeScoring: boolean;
+}) => IScoreResult;
 export {};