@nickchristensen/cliftin 2.1.0 → 3.0.0

package/README.md

@@ -73,7 +73,7 @@ DESCRIPTION
   List exercises
 ```
 
-_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/exercises/list.ts)_
+_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/exercises/list.ts)_
 
 ## `cliftin exercises show SELECTOR`
 
@@ -107,7 +107,7 @@ DESCRIPTION
   Show one exercise detail and history
 ```
 
-_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/exercises/show.ts)_
+_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/exercises/show.ts)_
 
 ## `cliftin help [COMMAND]`
 
@@ -144,7 +144,7 @@ DESCRIPTION
   List programs
 ```
 
-_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/programs/list.ts)_
+_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/programs/list.ts)_
 
 ## `cliftin programs show [SELECTOR]`
 
@@ -164,7 +164,7 @@ DESCRIPTION
   Show one program hierarchy
 ```
 
-_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/programs/show.ts)_
+_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/programs/show.ts)_
 
 ## `cliftin workouts list`
 
@@ -191,7 +191,7 @@ DESCRIPTION
   List workouts
 ```
 
-_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/workouts/list.ts)_
+_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/workouts/list.ts)_
 
 ## `cliftin workouts next`
 
@@ -208,7 +208,7 @@ DESCRIPTION
   Show the up-next routine from the active program
 ```
 
-_See code: [src/commands/workouts/next.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/workouts/next.ts)_
+_See code: [src/commands/workouts/next.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/workouts/next.ts)_
 
 ## `cliftin workouts show [WORKOUTID]`
 
@@ -228,5 +228,5 @@ DESCRIPTION
   Show one workout with exercises and sets
 ```
 
-_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/workouts/show.ts)_
+_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/workouts/show.ts)_
 <!-- commandsstop -->

package/dist/lib/repositories/programs.js

@@ -6,6 +6,24 @@ import { resolveIdOrName } from './selectors.js';
 function asBool(value) {
     return value === 1;
 }
+function buildPlannedFallbackSets(summary, unitPreference) {
+    return Array.from({ length: Math.max(summary.plannedSets ?? 1, 1) }, () => ({
+        id: null,
+        reps: summary.plannedReps,
+        rpe: null,
+        timeSeconds: summary.plannedTimeSeconds,
+        weight: convertKgToDisplayWeight(summary.plannedWeight, unitPreference),
+    }));
+}
+function explicitSetsMatchSummary(explicitSets, summary, unitPreference) {
+    const expectedCount = Math.max(summary.plannedSets ?? 1, 1);
+    const expectedWeight = convertKgToDisplayWeight(summary.plannedWeight, unitPreference);
+    if (explicitSets.length !== expectedCount)
+        return false;
+    return explicitSets.every((set) => set.reps === summary.plannedReps &&
+        set.timeSeconds === summary.plannedTimeSeconds &&
+        set.weight === expectedWeight);
+}
 export async function listPrograms(db) {
     const selectedProgram = await db
         .selectFrom('ZWORKOUTPROGRAMSINFO as info')
@@ -167,15 +185,16 @@ export async function getProgramDetail(db, programId) {
             continue;
         const current = exercisesByRoutine.get(row.routineId) ?? [];
         const explicitSets = setsByExerciseConfig.get(row.exerciseConfigId) ?? [];
-        const fallbackSet = explicitSets.length > 0
+        const plannedSummary = {
+            plannedReps: row.plannedReps,
+            plannedSets: row.plannedSets,
+            plannedTimeSeconds: row.plannedTimeSeconds,
+            plannedWeight: row.plannedWeight,
+        };
+        const fallbackSet = buildPlannedFallbackSets(plannedSummary, unitPreference);
+        const selectedSets = explicitSets.length > 0 && explicitSetsMatchSummary(explicitSets, plannedSummary, unitPreference)
             ? explicitSets
-            : Array.from({ length: Math.max(row.plannedSets ?? 1, 1) }, () => ({
-                id: null,
-                reps: row.plannedReps,
-                rpe: null,
-                timeSeconds: row.plannedTimeSeconds,
-                weight: convertKgToDisplayWeight(row.plannedWeight, unitPreference),
-            }));
+            : fallbackSet;
         current.push({
             exerciseConfigId: row.exerciseConfigId,
             id: row.exerciseId,
@@ -184,7 +203,7 @@ export async function getProgramDetail(db, programId) {
             plannedSets: row.plannedSets,
             plannedTimeSeconds: row.plannedTimeSeconds,
             plannedWeight: convertKgToDisplayWeight(row.plannedWeight, unitPreference),
-            sets: fallbackSet,
+            sets: selectedSets,
         });
         exercisesByRoutine.set(row.routineId, current);
     }

package/oclif.manifest.json

@@ -399,5 +399,5 @@
       ]
     }
   },
-  "version": "2.1.0"
+  "version": "3.0.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nickchristensen/cliftin",
   "description": "CLIftin: A read-only CLI for Liftin'",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "author": "Nick Christensen",
   "bin": {
     "cliftin": "./bin/run.js"