@dgpholdings/greatoak-shared 1.1.15 → 1.1.16

package/dist/types/TApiAuth.d.ts

@@ -81,12 +81,12 @@ export type TUser = {
     recoveryIssuedTimeStamp: number;
     recoveryVerifyToken: string;
     authMethod: TAuthType;
-    gender?: "male" | "female";
-    age?: number;
+    gender?: "male" | "female" | "unmentioned";
+    dob?: Date;
     weightKg?: number;
     heightCm?: number;
 };
-export type TUserSignInData = Pick<TUser, "email" | "isVerified" | "languageCountryCode" | "billingPlanType" | "billingPlanVersion" | "paymentMethod" | "authMethod">;
+export type TUserSignInData = Pick<TUser, "email" | "isVerified" | "languageCountryCode" | "billingPlanType" | "billingPlanVersion" | "paymentMethod" | "authMethod" | "dob" | "weightKg">;
 export type TApiForgotPasswordReq = {
     email: string;
     captchaToken: string;

package/dist/types/TApiExerciseRecord.d.ts

@@ -1,4 +1,3 @@
-import { TTemplateData } from "./TApiTemplateData";
 export type TRecord = {
     isDone: boolean;
     rpe?: string;
@@ -38,6 +37,7 @@ export type TRecordConfig = {
 };
 export type TApiExerciseRecordUpdateReq = {
     templateId: string;
+    startTime: Date;
     records: {
         exerciseId: string;
         config: TRecordConfig;
@@ -47,7 +47,6 @@ export type TApiExerciseRecordUpdateReq = {
 };
 export type TApiExerciseRecordUpdateRes = {
     status: 201;
-    updatedTemplate: TTemplateData;
 } | {
     status: 400;
 };

package/dist/types/TApiUser.d.ts

@@ -0,0 +1,8 @@
+export type TApiUserUpdateReq = {
+    dob: Date;
+    weightKg?: number;
+    appLanguage: string;
+    emailAddress?: string;
+    gender: "male" | "female" | "unmentioned";
+};
+export type TApiUserUpdateRes = TApiUserUpdateReq;

package/dist/types/TApiUser.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,16 @@
+export type TRecordType = "weight-reps" | "duration" | "body-weight";
+export interface TUserProfile {
+    age?: number;
+    gender?: "male" | "female" | "non-binary" | "unspecified";
+    weightKg?: number;
+}
+export interface TRecordInput {
+    isDone: boolean;
+    kg?: number;
+    reps?: number;
+    durationSecs?: string;
+    rpe?: number;
+    rir?: number;
+    auxWeightKg?: number;
+}
+export declare function computeScoreFromRecord(record: TRecordInput, recordType: TRecordType, userProfile?: TUserProfile): number;

package/dist/utils/scoring.utils.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.computeScoreFromRecord = computeScoreFromRecord;
+const time_util_1 = require("./time.util");
+function computeScoreFromRecord(record, recordType, userProfile) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    if (!record.isDone)
+        return 0;
+    // Determine load and effortFactor from record based on type
+    let load = 0;
+    let effortFactor = 0;
+    const rpe = (_a = record.rpe) !== null && _a !== void 0 ? _a : undefined;
+    const rir = (_b = record.rir) !== null && _b !== void 0 ? _b : undefined;
+    // Step 1: Determine effort factor
+    if (typeof rpe === "number") {
+        effortFactor = rpe;
+    }
+    else if (typeof rir === "number") {
+        effortFactor = 10 - rir; // lower RIR means more effort
+    }
+    // Step 2: Determine load
+    switch (recordType) {
+        case "weight-reps": {
+            const kg = (_c = record.kg) !== null && _c !== void 0 ? _c : 0;
+            const reps = (_d = record.reps) !== null && _d !== void 0 ? _d : 0;
+            load = kg * reps;
+            break;
+        }
+        case "duration": {
+            const durationSecs = (0, time_util_1.mmssToSecs)((_e = record.durationSecs) !== null && _e !== void 0 ? _e : "00:00");
+            const auxWeight = (_f = record.auxWeightKg) !== null && _f !== void 0 ? _f : 0;
+            load = auxWeight > 0 ? auxWeight * durationSecs : durationSecs;
+            break;
+        }
+        case "body-weight": {
+            const reps = (_g = record.reps) !== null && _g !== void 0 ? _g : 0;
+            const auxWeight = (_h = record.auxWeightKg) !== null && _h !== void 0 ? _h : 0;
+            load = auxWeight > 0 ? auxWeight * reps : reps;
+            break;
+        }
+        default:
+            return 0;
+    }
+    return computeFinalScore(load, effortFactor, userProfile);
+}
+function computeFinalScore(load, effortFactor, userProfile) {
+    const base = Math.log10(1 + Math.max(0, load));
+    const effortBoost = 1 + Math.min(effortFactor, 10) * 0.05;
+    // Optional scaling
+    let adjustment = 1;
+    if ((userProfile === null || userProfile === void 0 ? void 0 : userProfile.gender) === "female")
+        adjustment *= 1.1;
+    if ((userProfile === null || userProfile === void 0 ? void 0 : userProfile.age) && userProfile.age > 50)
+        adjustment *= 1.15;
+    if ((userProfile === null || userProfile === void 0 ? void 0 : userProfile.weightKg) && userProfile.weightKg > 0) {
+        const normalizedWeight = 70;
+        adjustment *= normalizedWeight / userProfile.weightKg;
+    }
+    return base * effortBoost * adjustment;
+}

package/dist/utils/time.util.d.ts

@@ -1 +1 @@
-export declare const mmssToSecs: (mmss: string) => number | undefined;
+export declare const mmssToSecs: (mmss: string) => number;

package/dist/utils/time.util.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mmssToSecs = void 0;
-const number_util_1 = require("./number.util");
 const mmssToSecs = (mmss) => {
-    const [mm, ss] = mmss.split(":");
-    return (0, number_util_1.toNumber)(`${mm}${ss}`);
+    const [min, sec] = mmss.split(":").map(Number);
+    return (min || 0) * 60 + (sec || 0);
 };
 exports.mmssToSecs = mmssToSecs;

package/package.json

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