@aneuhold/core-ts-db-lib 5.0.4 → 5.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/lib/ctos/workout/WorkoutExerciseCTO.d.ts +40 -0
- package/lib/ctos/workout/WorkoutExerciseCTO.d.ts.map +1 -1
- package/lib/ctos/workout/WorkoutExerciseCTO.js +26 -6
- package/lib/ctos/workout/WorkoutExerciseCTO.js.map +1 -1
- package/lib/ctos/workout/WorkoutExerciseCTO.ts +28 -6
- package/lib/services/workout/Set/WorkoutSetService.js +3 -3
- package/lib/services/workout/Set/WorkoutSetService.js.map +1 -1
- package/lib/services/workout/Set/WorkoutSetService.ts +3 -3
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## 🔖 [5.0.5] (2026-04-15)
|
|
9
|
+
|
|
10
|
+
### ✅ Added
|
|
11
|
+
|
|
12
|
+
- Added `lastSessionExercise` and `lastSessionSets` fields to `WorkoutExerciseCTO` representing the literal most recent completed session exercise (including deload and free-form sessions).
|
|
13
|
+
|
|
14
|
+
### 🏗️ Changed
|
|
15
|
+
|
|
16
|
+
- *Breaking Change:* Renamed `lastSessionExercise` → `lastAccumulationSessionExercise` and `lastSessionSets` → `lastAccumulationSessionSets` in `WorkoutExerciseCTO`; these fields now exclusively reflect the most recent non-deload accumulation session.
|
|
17
|
+
- `WorkoutSetService` now uses `lastAccumulationSessionSets` for first-microcycle progression and autoregulation calculations.
|
|
18
|
+
|
|
8
19
|
## 🔖 [5.0.4] (2026-03-26)
|
|
9
20
|
|
|
10
21
|
### ✅ Added
|
|
@@ -428,6 +439,7 @@ Updated dependency: now requires `@aneuhold/core-ts-lib@^2.3.11`.
|
|
|
428
439
|
- Updated workflow permissions to allow repository write access
|
|
429
440
|
|
|
430
441
|
<!-- Link References -->
|
|
442
|
+
[5.0.5]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v5.0.4...core-ts-db-lib-v5.0.5
|
|
431
443
|
[5.0.4]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v5.0.3...core-ts-db-lib-v5.0.4
|
|
432
444
|
[5.0.3]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v5.0.2...core-ts-db-lib-v5.0.3
|
|
433
445
|
[5.0.2]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v5.0.1...core-ts-db-lib-v5.0.2
|
|
@@ -88,6 +88,46 @@ export declare const WorkoutExerciseCTOSchema: z.ZodObject<{
|
|
|
88
88
|
_id: z.ZodPipe<z.ZodDefault<z.ZodUUID>, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
89
89
|
userId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
90
90
|
}, z.core.$strip>>>;
|
|
91
|
+
lastAccumulationSessionExercise: z.ZodNullable<z.ZodObject<{
|
|
92
|
+
docType: z.ZodDefault<z.ZodLiteral<"workoutSessionExercise">>;
|
|
93
|
+
workoutSessionId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
94
|
+
workoutExerciseId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
95
|
+
setOrder: z.ZodDefault<z.ZodArray<z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>>>;
|
|
96
|
+
rsm: z.ZodOptional<z.ZodNullable<z.ZodObject<{
|
|
97
|
+
mindMuscleConnection: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
98
|
+
pump: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
99
|
+
disruption: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
100
|
+
}, z.core.$strip>>>;
|
|
101
|
+
fatigue: z.ZodOptional<z.ZodNullable<z.ZodObject<{
|
|
102
|
+
jointAndTissueDisruption: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
103
|
+
perceivedEffort: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
104
|
+
unusedMusclePerformance: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
105
|
+
}, z.core.$strip>>>;
|
|
106
|
+
sorenessScore: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
107
|
+
performanceScore: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
108
|
+
isRecoveryExercise: z.ZodDefault<z.ZodBoolean>;
|
|
109
|
+
createdDate: z.ZodDefault<z.ZodDate>;
|
|
110
|
+
lastUpdatedDate: z.ZodDefault<z.ZodDate>;
|
|
111
|
+
_id: z.ZodPipe<z.ZodDefault<z.ZodUUID>, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
112
|
+
userId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
113
|
+
}, z.core.$strip>>;
|
|
114
|
+
lastAccumulationSessionSets: z.ZodDefault<z.ZodArray<z.ZodObject<{
|
|
115
|
+
docType: z.ZodDefault<z.ZodLiteral<"workoutSet">>;
|
|
116
|
+
workoutExerciseId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
117
|
+
workoutSessionId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
118
|
+
workoutSessionExerciseId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
119
|
+
plannedReps: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
120
|
+
plannedWeight: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
121
|
+
plannedRir: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
122
|
+
actualReps: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
123
|
+
actualWeight: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
124
|
+
rir: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
|
|
125
|
+
exerciseProperties: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>>;
|
|
126
|
+
createdDate: z.ZodDefault<z.ZodDate>;
|
|
127
|
+
lastUpdatedDate: z.ZodDefault<z.ZodDate>;
|
|
128
|
+
_id: z.ZodPipe<z.ZodDefault<z.ZodUUID>, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
129
|
+
userId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
130
|
+
}, z.core.$strip>>>;
|
|
91
131
|
docType: z.ZodDefault<z.ZodLiteral<"workoutExercise">>;
|
|
92
132
|
exerciseName: z.ZodString;
|
|
93
133
|
workoutEquipmentTypeId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkoutExerciseCTO.d.ts","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB
|
|
1
|
+
{"version":3,"file":"WorkoutExerciseCTO.d.ts","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAoEnC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
|
|
@@ -34,6 +34,24 @@ export const WorkoutExerciseCTOSchema = z.object({
|
|
|
34
34
|
* provides the raw source data for 1RM comparison.
|
|
35
35
|
*/
|
|
36
36
|
bestSet: WorkoutSetSchema.nullable(),
|
|
37
|
+
/**
|
|
38
|
+
* The most recent completed WorkoutSessionExercise for this exercise,
|
|
39
|
+
* regardless of cycle type or deload status. Includes free-form, deload,
|
|
40
|
+
* and accumulation sessions — whichever was performed most recently.
|
|
41
|
+
*
|
|
42
|
+
* Null if the exercise has never been performed.
|
|
43
|
+
*
|
|
44
|
+
* Contains: sorenessScore, performanceScore, rsm, fatigue, setOrder, etc.
|
|
45
|
+
*/
|
|
46
|
+
lastSessionExercise: WorkoutSessionExerciseSchema.nullable(),
|
|
47
|
+
/**
|
|
48
|
+
* All WorkoutSets from the lastSessionExercise's setOrder. Represents the
|
|
49
|
+
* literal most recent prior performance — suitable for "what did I do
|
|
50
|
+
* last time" displays.
|
|
51
|
+
*
|
|
52
|
+
* Empty array if no previous performance exists.
|
|
53
|
+
*/
|
|
54
|
+
lastSessionSets: z.array(WorkoutSetSchema).default([]),
|
|
37
55
|
/**
|
|
38
56
|
* The most recent completed WorkoutSessionExercise for this exercise,
|
|
39
57
|
* from a non-deload accumulation session. Deload sessions (where all sets
|
|
@@ -42,16 +60,18 @@ export const WorkoutExerciseCTOSchema = z.object({
|
|
|
42
60
|
*
|
|
43
61
|
* Null if the exercise has never been performed in an accumulation session.
|
|
44
62
|
*
|
|
45
|
-
*
|
|
63
|
+
* Used by autoregulation / progression logic that requires a meaningful
|
|
64
|
+
* non-deload baseline.
|
|
46
65
|
*/
|
|
47
|
-
|
|
66
|
+
lastAccumulationSessionExercise: WorkoutSessionExerciseSchema.nullable(),
|
|
48
67
|
/**
|
|
49
|
-
* All WorkoutSets from the
|
|
50
|
-
* averaged across all sets for a holistic performance signal
|
|
51
|
-
* autoregulation (the first set alone can mask poor later-set
|
|
68
|
+
* All WorkoutSets from the lastAccumulationSessionExercise's setOrder.
|
|
69
|
+
* Surplus is averaged across all sets for a holistic performance signal
|
|
70
|
+
* during autoregulation (the first set alone can mask poor later-set
|
|
71
|
+
* performance).
|
|
52
72
|
*
|
|
53
73
|
* Empty array if no previous accumulation performance exists.
|
|
54
74
|
*/
|
|
55
|
-
|
|
75
|
+
lastAccumulationSessionSets: z.array(WorkoutSetSchema).default([])
|
|
56
76
|
});
|
|
57
77
|
//# sourceMappingURL=WorkoutExerciseCTO.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkoutExerciseCTO.js","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/C,GAAG,qBAAqB,CAAC,KAAK;IAE9B;;;OAGG;IACH,aAAa,EAAE,0BAA0B;IAEzC;;;;OAIG;IACH,eAAe,EAAE,gCAAgC,CAAC,QAAQ,EAAE;IAE5D;;;;;;;OAOG;IACH,OAAO,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IAEpC
|
|
1
|
+
{"version":3,"file":"WorkoutExerciseCTO.js","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/C,GAAG,qBAAqB,CAAC,KAAK;IAE9B;;;OAGG;IACH,aAAa,EAAE,0BAA0B;IAEzC;;;;OAIG;IACH,eAAe,EAAE,gCAAgC,CAAC,QAAQ,EAAE;IAE5D;;;;;;;OAOG;IACH,OAAO,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IAEpC;;;;;;;;OAQG;IACH,mBAAmB,EAAE,4BAA4B,CAAC,QAAQ,EAAE;IAE5D;;;;;;OAMG;IACH,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAEtD;;;;;;;;;;OAUG;IACH,+BAA+B,EAAE,4BAA4B,CAAC,QAAQ,EAAE;IAExE;;;;;;;OAOG;IACH,2BAA2B,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CACnE,CAAC,CAAC"}
|
|
@@ -39,6 +39,26 @@ export const WorkoutExerciseCTOSchema = z.object({
|
|
|
39
39
|
*/
|
|
40
40
|
bestSet: WorkoutSetSchema.nullable(),
|
|
41
41
|
|
|
42
|
+
/**
|
|
43
|
+
* The most recent completed WorkoutSessionExercise for this exercise,
|
|
44
|
+
* regardless of cycle type or deload status. Includes free-form, deload,
|
|
45
|
+
* and accumulation sessions — whichever was performed most recently.
|
|
46
|
+
*
|
|
47
|
+
* Null if the exercise has never been performed.
|
|
48
|
+
*
|
|
49
|
+
* Contains: sorenessScore, performanceScore, rsm, fatigue, setOrder, etc.
|
|
50
|
+
*/
|
|
51
|
+
lastSessionExercise: WorkoutSessionExerciseSchema.nullable(),
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* All WorkoutSets from the lastSessionExercise's setOrder. Represents the
|
|
55
|
+
* literal most recent prior performance — suitable for "what did I do
|
|
56
|
+
* last time" displays.
|
|
57
|
+
*
|
|
58
|
+
* Empty array if no previous performance exists.
|
|
59
|
+
*/
|
|
60
|
+
lastSessionSets: z.array(WorkoutSetSchema).default([]),
|
|
61
|
+
|
|
42
62
|
/**
|
|
43
63
|
* The most recent completed WorkoutSessionExercise for this exercise,
|
|
44
64
|
* from a non-deload accumulation session. Deload sessions (where all sets
|
|
@@ -47,18 +67,20 @@ export const WorkoutExerciseCTOSchema = z.object({
|
|
|
47
67
|
*
|
|
48
68
|
* Null if the exercise has never been performed in an accumulation session.
|
|
49
69
|
*
|
|
50
|
-
*
|
|
70
|
+
* Used by autoregulation / progression logic that requires a meaningful
|
|
71
|
+
* non-deload baseline.
|
|
51
72
|
*/
|
|
52
|
-
|
|
73
|
+
lastAccumulationSessionExercise: WorkoutSessionExerciseSchema.nullable(),
|
|
53
74
|
|
|
54
75
|
/**
|
|
55
|
-
* All WorkoutSets from the
|
|
56
|
-
* averaged across all sets for a holistic performance signal
|
|
57
|
-
* autoregulation (the first set alone can mask poor later-set
|
|
76
|
+
* All WorkoutSets from the lastAccumulationSessionExercise's setOrder.
|
|
77
|
+
* Surplus is averaged across all sets for a holistic performance signal
|
|
78
|
+
* during autoregulation (the first set alone can mask poor later-set
|
|
79
|
+
* performance).
|
|
58
80
|
*
|
|
59
81
|
* Empty array if no previous accumulation performance exists.
|
|
60
82
|
*/
|
|
61
|
-
|
|
83
|
+
lastAccumulationSessionSets: z.array(WorkoutSetSchema).default([])
|
|
62
84
|
});
|
|
63
85
|
|
|
64
86
|
/**
|
|
@@ -17,10 +17,10 @@ export default class WorkoutSetService {
|
|
|
17
17
|
throw new Error(`No calibration found for exercise ${exerciseCTO._id}, ${exerciseCTO.exerciseName}`);
|
|
18
18
|
}
|
|
19
19
|
const sets = [];
|
|
20
|
-
// For the first microcycle, use the CTO's previous performance
|
|
21
|
-
// For subsequent microcycles, look up all previous sets from the context.
|
|
20
|
+
// For the first microcycle, use the CTO's previous accumulation performance
|
|
21
|
+
// data. For subsequent microcycles, look up all previous sets from the context.
|
|
22
22
|
const previousSets = microcycleIndex === 0
|
|
23
|
-
? exerciseCTO.
|
|
23
|
+
? exerciseCTO.lastAccumulationSessionSets
|
|
24
24
|
: this.findPreviousSets(context, exerciseCTO._id, microcycleIndex);
|
|
25
25
|
// Calculate progressed targets for the first set.
|
|
26
26
|
// Autoregulation/forecasting handles progression from the previous sets' data.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkoutSetService.js","sourceRoot":"","sources":["../../../../src/services/workout/Set/WorkoutSetService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAmB,MAAM,0CAA0C,CAAC;AAC7F,OAAO,2BAA2B,MAAM,iDAAiD,CAAC;AAC1F,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAG3E,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;;;;;OAQG;IACH,MAAM,CAAC,8BAA8B,CAAC,EACpC,OAAO,EACP,WAAW,EACX,OAAO,EACP,eAAe,EACf,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,kBAAkB,EAWnB;QACC,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,WAAW,CAAC;QACvD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,qCAAqC,WAAW,CAAC,GAAG,KAAK,WAAW,CAAC,YAAY,EAAE,CACpF,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAiB,EAAE,CAAC;QAE9B,
|
|
1
|
+
{"version":3,"file":"WorkoutSetService.js","sourceRoot":"","sources":["../../../../src/services/workout/Set/WorkoutSetService.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,11 +49,11 @@ export default class WorkoutSetService {
|
|
|
49
49
|
|
|
50
50
|
const sets: WorkoutSet[] = [];
|
|
51
51
|
|
|
52
|
-
// For the first microcycle, use the CTO's previous performance
|
|
53
|
-
// For subsequent microcycles, look up all previous sets from the context.
|
|
52
|
+
// For the first microcycle, use the CTO's previous accumulation performance
|
|
53
|
+
// data. For subsequent microcycles, look up all previous sets from the context.
|
|
54
54
|
const previousSets =
|
|
55
55
|
microcycleIndex === 0
|
|
56
|
-
? exerciseCTO.
|
|
56
|
+
? exerciseCTO.lastAccumulationSessionSets
|
|
57
57
|
: this.findPreviousSets(context, exerciseCTO._id, microcycleIndex);
|
|
58
58
|
|
|
59
59
|
// Calculate progressed targets for the first set.
|
package/package.json
CHANGED