@dgpholdings/greatoak-shared 1.1.15 → 1.1.17

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/index.d.ts

@@ -1,3 +1,7 @@
 export { toNumber } from "./number.util";
 export { mmssToSecs } from "./time.util";
 export { countryToCurrencyCode } from "./billing.utils";
+export { computeScoreFromRecord } from "./scoring.utils";
+export { isDefined, isDefinedNumber } from "./isDefined.utils";
+export { refineRecordEntry } from "./record.utils";
+export type { TRefinedRecord, TRefinedBodyWeightRecord, TRefinedDurationRecord, TRefinedWeightRecord, } from "./record.utils";

package/dist/utils/index.js

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.countryToCurrencyCode = exports.mmssToSecs = exports.toNumber = void 0;
+exports.refineRecordEntry = exports.isDefinedNumber = exports.isDefined = exports.computeScoreFromRecord = exports.countryToCurrencyCode = 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");
 Object.defineProperty(exports, "mmssToSecs", { enumerable: true, get: function () { return time_util_1.mmssToSecs; } });
 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; } });
+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; } });

package/dist/utils/isDefined.utils.d.ts

@@ -0,0 +1,2 @@
+export declare const isDefined: <T>(arg: T | null | undefined) => arg is NonNullable<T>;
+export declare const isDefinedNumber: (value: unknown) => value is number;

package/dist/utils/isDefined.utils.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDefinedNumber = exports.isDefined = void 0;
+const isDefined = (arg) => {
+    return arg !== null && arg !== undefined;
+};
+exports.isDefined = isDefined;
+const isDefinedNumber = (value) => {
+    return (0, exports.isDefined)(value) && typeof value === "number" && !isNaN(value);
+};
+exports.isDefinedNumber = isDefinedNumber;

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

@@ -0,0 +1,26 @@
+import { TRecord } from "../types";
+type RefinedBase = {
+    isDone: boolean;
+    rpe?: number;
+    rir?: number;
+    restInBetweenDurationSecs?: number;
+    setNote?: string;
+};
+export type TRefinedWeightRecord = RefinedBase & {
+    type: "weight-reps";
+    kg: number;
+    reps: number;
+};
+export type TRefinedDurationRecord = RefinedBase & {
+    type: "duration";
+    durationSecs: string;
+    auxWeightKg?: number;
+};
+export type TRefinedBodyWeightRecord = RefinedBase & {
+    type: "reps-only";
+    reps: number;
+    auxWeightKg?: number;
+};
+export type TRefinedRecord = TRefinedWeightRecord | TRefinedDurationRecord | TRefinedBodyWeightRecord;
+export declare const refineRecordEntry: (entry: TRecord) => TRefinedRecord;
+export {};

package/dist/utils/record.utils.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refineRecordEntry = void 0;
+const isDefined_utils_1 = require("./isDefined.utils");
+const number_util_1 = require("./number.util");
+const refineRecordEntry = (entry) => {
+    var _a, _b, _c;
+    const base = Object.assign(Object.assign(Object.assign({ isDone: entry.isDone }, ((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)((0, number_util_1.toNumber)(entry.restInBetweenDurationSecs)) && {
+        restInBetweenDurationSecs: (0, number_util_1.toNumber)(entry.restInBetweenDurationSecs),
+    })), ((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, rir: (0, isDefined_utils_1.isDefinedNumber)((0, number_util_1.toNumber)(entry.rir))
+                ? (0, number_util_1.toNumber)(entry.rir)
+                : undefined, reps: (_b = (0, number_util_1.toNumber)(entry.reps)) !== null && _b !== void 0 ? _b : 0 });
+    }
+    if (entry.type === "duration") {
+        return Object.assign(Object.assign(Object.assign({}, base), { type: "duration", durationSecs: entry.durationSecs }), ((0, isDefined_utils_1.isDefinedNumber)((0, number_util_1.toNumber)(entry.auxWeightKg)) && {
+            auxWeightKg: (0, number_util_1.toNumber)(entry.auxWeightKg),
+        }));
+    }
+    if (entry.type === "reps-only") {
+        return Object.assign(Object.assign(Object.assign({}, base), { type: "reps-only", rir: (0, isDefined_utils_1.isDefinedNumber)((0, number_util_1.toNumber)(entry.rir))
+                ? (0, number_util_1.toNumber)(entry.rir)
+                : undefined, reps: (_c = (0, number_util_1.toNumber)(entry.reps)) !== null && _c !== void 0 ? _c : 0 }), ((0, isDefined_utils_1.isDefinedNumber)((0, number_util_1.toNumber)(entry.auxWeightKg)) && {
+            auxWeightKg: (0, number_util_1.toNumber)(entry.auxWeightKg),
+        }));
+    }
+    throw new Error(`Unknown record type: ${entry.type}`);
+};
+exports.refineRecordEntry = refineRecordEntry;

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.17",
   "description": "Shared TypeScript types and utilities for @dgpholdings projects",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",