@nickchristensen/cliftin 1.3.1 → 2.1.0

package/README.md

@@ -73,7 +73,7 @@ DESCRIPTION
   List exercises
 ```
 
-_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v1.3.1/src/commands/exercises/list.ts)_
+_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.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/v1.3.1/src/commands/exercises/show.ts)_
+_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.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/v1.3.1/src/commands/programs/list.ts)_
+_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.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/v1.3.1/src/commands/programs/show.ts)_
+_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.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/v1.3.1/src/commands/workouts/list.ts)_
+_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.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/v1.3.1/src/commands/workouts/next.ts)_
+_See code: [src/commands/workouts/next.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.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/v1.3.1/src/commands/workouts/show.ts)_
+_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v2.1.0/src/commands/workouts/show.ts)_
 <!-- commandsstop -->

package/dist/commands/exercises/list.js

@@ -36,8 +36,12 @@ export default class Exercises extends Command {
                 name: flags.name,
                 sort: flags.sort,
             });
-            if (this.jsonEnabled())
-                return exercises;
+            if (this.jsonEnabled()) {
+                return exercises.map(({ id, ...exercise }) => ({
+                    ...exercise,
+                    exerciseId: id,
+                }));
+            }
             this.log(renderTable(exercises.map((exercise) => ({
                 equipment: exercise.equipment,
                 id: exercise.id,

package/dist/commands/exercises/show.js

@@ -64,20 +64,11 @@ export default class ExercisesShow extends Command {
                     })),
                     topWeight: withWeightUnit(row.topWeight, historyUnitPreference),
                 }));
+                const { id: detailId, ...exerciseDetail } = detail;
                 return {
-                    defaultProgressMetric: detail.defaultProgressMetric,
-                    equipment: detail.equipment,
+                    exerciseId: detailId,
+                    ...exerciseDetail,
                     history,
-                    id: detail.id,
-                    name: detail.name,
-                    perceptionScale: detail.perceptionScale,
-                    primaryMuscles: detail.primaryMuscles,
-                    recentRoutines: detail.recentRoutines,
-                    secondaryMuscles: detail.secondaryMuscles,
-                    supports1RM: detail.supports1RM,
-                    timerBased: detail.timerBased,
-                    totalRoutines: detail.totalRoutines,
-                    totalWorkouts: detail.totalWorkouts,
                 };
             }
             this.log(`[${detail.id}] ${detail.name ?? '(unnamed)'}`);
@@ -103,6 +94,7 @@ export default class ExercisesShow extends Command {
             this.log('');
             this.log(renderTable(lastPerformedSnapshot.exercise.sets.map((set) => ({
                 id: set.id,
+                isWarmup: set.isWarmup,
                 reps: set.reps,
                 rpe: set.rpe,
                 timeSeconds: set.timeSeconds,

package/dist/commands/programs/list.js

@@ -10,8 +10,12 @@ export default class Programs extends Command {
         const context = openDb();
         try {
             const programs = await listPrograms(context.db);
-            if (this.jsonEnabled())
-                return programs;
+            if (this.jsonEnabled()) {
+                return programs.map(({ id, ...program }) => ({
+                    ...program,
+                    programId: id,
+                }));
+            }
             this.log(renderTable(programs.map((program) => ({
                 dateAdded: program.dateAdded,
                 id: program.id,

package/dist/commands/workouts/list.js

@@ -35,12 +35,13 @@ export default class Workouts extends Command {
                 to: flags.to,
             });
             if (this.jsonEnabled()) {
-                return workouts.map((workout) => ({
+                return workouts.map(({ duration, id, ...workout }) => ({
                     ...workout,
                     duration: {
                         unit: 'seconds',
-                        value: workout.duration,
+                        value: duration,
                     },
+                    workoutId: id,
                 }));
             }
             this.log(renderTable(workouts.map((workout) => {

package/dist/commands/workouts/show.js

@@ -61,6 +61,7 @@ export default class WorkoutsShow extends Command {
                 this.log(`[${exercise.exerciseId ?? exercise.exerciseResultId}] ${exercise.name ?? '(unnamed)'}`);
                 this.log(renderTable(exercise.sets.map((set) => ({
                     id: set.id,
+                    isWarmup: set.isWarmup,
                     reps: set.reps,
                     rpe: set.rpe,
                     timeSeconds: set.timeSeconds,

package/dist/lib/db.d.ts

@@ -47,6 +47,7 @@ export interface DatabaseSchema {
         ZRPE: null | number;
         ZTIME: null | number;
         ZVOLUME: null | number;
+        ZWARMUPSET: null | number;
         ZWEIGHT: null | number;
     };
     ZPERIOD: {

package/dist/lib/json-weight.js

@@ -1,4 +1,7 @@
 import { withWeightUnit } from './units.js';
+function omitId(value) {
+    return Object.fromEntries(Object.entries(value).filter(([key]) => key !== 'id'));
+}
 export function serializeExerciseHistoryRowsWithWeightUnits(rows, unitPreference) {
     return rows.map((row) => ({
         ...row,
@@ -6,46 +9,62 @@ export function serializeExerciseHistoryRowsWithWeightUnits(rows, unitPreference
     }));
 }
 export function serializeProgramDetailWithWeightUnits(detail, unitPreference) {
+    const program = omitId(detail.program);
     return {
-        ...detail,
+        program: { ...program, programId: detail.program.id },
         weeks: detail.weeks.map((week) => ({
-            ...week,
             routines: week.routines.map((routine) => ({
-                ...routine,
+                ...omitId(routine),
                 exercises: routine.exercises.map((exercise) => ({
-                    ...exercise,
+                    ...omitId(exercise),
+                    exerciseId: exercise.id,
                     plannedWeight: withWeightUnit(exercise.plannedWeight, unitPreference),
                     sets: exercise.sets.map((set) => ({
-                        ...set,
+                        ...omitId(set),
+                        setId: set.id,
                         weight: withWeightUnit(set.weight, unitPreference),
                     })),
                 })),
+                routineId: routine.id,
             })),
+            weekId: week.id,
         })),
     };
 }
 export function serializeNextWorkoutDetailWithWeightUnits(detail, unitPreference) {
+    const program = omitId(detail.program);
     return {
-        ...detail,
+        program: { ...program, programId: detail.program.id },
         routine: {
-            ...detail.routine,
+            ...omitId(detail.routine),
             exercises: detail.routine.exercises.map((exercise) => ({
-                ...exercise,
+                ...omitId(exercise),
+                exerciseId: exercise.id,
                 plannedWeight: withWeightUnit(exercise.plannedWeight, unitPreference),
                 sets: exercise.sets.map((set) => ({
-                    ...set,
+                    ...omitId(set),
+                    setId: set.id,
                     weight: withWeightUnit(set.weight, unitPreference),
                 })),
             })),
+            routineId: detail.routine.id,
+        },
+        week: {
+            number: detail.week.number,
+            weekId: detail.week.id,
         },
     };
 }
 export function serializeWorkoutDetailWithWeightUnits(detail, unitPreference) {
     return {
-        ...detail,
+        date: detail.date,
+        duration: detail.duration,
         exercises: detail.exercises.map((exercise) => ({
-            ...exercise,
+            exerciseId: exercise.exerciseId,
+            exerciseResultId: exercise.exerciseResultId,
+            name: exercise.name,
             sets: exercise.sets.map((set) => ({
+                isWarmup: set.isWarmup,
                 reps: set.reps,
                 rpe: set.rpe,
                 setId: set.id,
@@ -54,5 +73,8 @@ export function serializeWorkoutDetailWithWeightUnits(detail, unitPreference) {
                 weight: withWeightUnit(set.weight, unitPreference),
             })),
         })),
+        program: detail.program,
+        routine: detail.routine,
+        workoutId: detail.id,
     };
 }

package/dist/lib/repositories/exercises.js

@@ -7,6 +7,11 @@ import { getWorkoutDetail } from './workouts.js';
 function asBool(value) {
     return value === 1;
 }
+const workingSetCountExpr = sql `sum(case when gs.Z_PK is not null and coalesce(gs.ZWARMUPSET, 0) != 1 then 1 else 0 end)`;
+const workingSetTotalRepsExpr = sql `coalesce(sum(case when coalesce(gs.ZWARMUPSET, 0) != 1 then gs.ZREPS else 0 end), 0)`;
+const workingSetTopRepsExpr = sql `max(case when coalesce(gs.ZWARMUPSET, 0) != 1 then gs.ZREPS end)`;
+const workingSetTopWeightExpr = sql `max(case when coalesce(gs.ZWARMUPSET, 0) != 1 then gs.ZWEIGHT end)`;
+const workingSetVolumeExpr = sql `coalesce(sum(case when coalesce(gs.ZWARMUPSET, 0) != 1 then gs.ZVOLUME else 0 end), 0)`;
 function renderSelectorCandidateList(candidates) {
     return candidates
         .map((candidate) => ({
@@ -142,11 +147,11 @@ export async function getExerciseHistoryRows(db, exerciseId, filters) {
         'wr.ZSTARTDATE as startDate',
         'wr.ZROUTINENAME as routineNameFromResult',
         'r.ZNAME as routineNameFromPlan',
-        (eb) => eb.fn.count('gs.Z_PK').as('sets'),
-        (eb) => eb.fn.coalesce(eb.fn.sum('gs.ZREPS'), eb.val(0)).as('totalReps'),
-        (eb) => eb.fn.max('gs.ZREPS').as('topReps'),
-        (eb) => eb.fn.max('gs.ZWEIGHT').as('topWeight'),
-        (eb) => eb.fn.coalesce(eb.fn.sum('gs.ZVOLUME'), eb.val(0)).as('volume'),
+        workingSetCountExpr.as('sets'),
+        workingSetTotalRepsExpr.as('totalReps'),
+        workingSetTopRepsExpr.as('topReps'),
+        workingSetTopWeightExpr.as('topWeight'),
+        workingSetVolumeExpr.as('volume'),
     ])
         .where('ei.Z_PK', '=', exerciseId)
         .groupBy(['wr.Z_PK', 'wr.ZSTARTDATE', 'wr.ZROUTINENAME', 'r.ZNAME'])
@@ -164,13 +169,13 @@ export async function getExerciseHistoryRows(db, exerciseId, filters) {
     if (dateRange.to !== undefined)
         query = query.where('wr.ZSTARTDATE', '<=', dateRange.to);
     if (filters.minReps !== undefined)
-        query = query.having((eb) => eb.fn.max('gs.ZREPS'), '>=', filters.minReps);
+        query = query.having(workingSetTopRepsExpr, '>=', filters.minReps);
     if (filters.maxReps !== undefined)
-        query = query.having((eb) => eb.fn.max('gs.ZREPS'), '<=', filters.maxReps);
+        query = query.having(workingSetTopRepsExpr, '<=', filters.maxReps);
     if (minWeightKg !== undefined)
-        query = query.having((eb) => eb.fn.max('gs.ZWEIGHT'), '>=', minWeightKg);
+        query = query.having(workingSetTopWeightExpr, '>=', minWeightKg);
     if (maxWeightKg !== undefined)
-        query = query.having((eb) => eb.fn.max('gs.ZWEIGHT'), '<=', maxWeightKg);
+        query = query.having(workingSetTopWeightExpr, '<=', maxWeightKg);
     if (filters.limit !== undefined)
         query = query.limit(filters.limit);
     const rows = await query.execute();
@@ -199,6 +204,7 @@ export async function getExerciseHistoryWithSetsRows(db, exerciseId, filters) {
             date: summary.date,
             routine: summary.routine,
             sets: (exercise?.sets ?? []).map((set) => ({
+                isWarmup: set.isWarmup,
                 reps: set.reps,
                 setId: set.id,
                 timeSeconds: set.timeSeconds,

package/dist/lib/repositories/workouts.js

@@ -136,6 +136,7 @@ export async function getWorkoutDetail(db, workoutId) {
             'ZWEIGHT as weight',
             'ZTIME as timeSeconds',
             'ZVOLUME as volume',
+            'ZWARMUPSET as warmupSet',
         ])
             .where('ZEXERCISE', 'in', exerciseResultIds)
             .orderBy('Z_FOK_EXERCISE', 'asc')
@@ -148,6 +149,7 @@ export async function getWorkoutDetail(db, workoutId) {
         const current = setsByExercise.get(row.exerciseResultId) ?? [];
         current.push({
             id: row.id,
+            isWarmup: asBool(row.warmupSet),
             reps: row.reps,
             rpe: normalizeRpe(row.rpe),
             timeSeconds: row.timeSeconds,

package/dist/lib/types.d.ts

@@ -48,6 +48,7 @@ export type WorkoutSummary = {
 };
 export type WorkoutSet = {
     id: number;
+    isWarmup: boolean;
     reps: null | number;
     rpe: null | number;
     timeSeconds: null | number;
@@ -98,6 +99,7 @@ export type ExerciseHistoryRow = {
     workoutId: number;
 };
 export type ExerciseHistorySet = {
+    isWarmup: boolean;
     reps: null | number;
     setId: number;
     timeSeconds: null | number;

package/oclif.manifest.json

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

package/package.json

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