@nickchristensen/cliftin 4.0.0 → 4.1.0

package/README.md

@@ -78,7 +78,7 @@ DESCRIPTION
   List exercises
 ```
 
-_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/exercises/list.ts)_
+_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/exercises/list.ts)_
 
 ## `cliftin exercises show SELECTOR`
 
@@ -87,8 +87,8 @@ Show one exercise detail and history
 ```
 USAGE
   $ cliftin exercises show SELECTOR [--json] [--all | --limit <value>] [--from <value>] [--max-reps <value>]
-    [--max-weight <value>] [--min-reps <value>] [--min-weight <value>] [--program <value>] [--routine <value>] [--to
-    <value>]
+    [--max-weight <value>] [--min-reps <value>] [--min-weight <value>] [--no-warmup] [--program <value>] [--routine
+    <value>] [--to <value>]
 
 ARGUMENTS
   SELECTOR  exercise id or name
@@ -101,6 +101,7 @@ FLAGS
   --max-weight=<value>  History max top weight
   --min-reps=<value>    History min top reps
   --min-weight=<value>  History min top weight
+  --no-warmup           Hide warmup sets from output
   --program=<value>     History filter by program id or name
   --routine=<value>     History filter by routine id or name
   --to=<value>          History end date YYYY-MM-DD
@@ -112,7 +113,7 @@ DESCRIPTION
   Show one exercise detail and history
 ```
 
-_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/exercises/show.ts)_
+_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/exercises/show.ts)_
 
 ## `cliftin help [COMMAND]`
 
@@ -149,7 +150,7 @@ DESCRIPTION
   List programs
 ```
 
-_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/programs/list.ts)_
+_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/programs/list.ts)_
 
 ## `cliftin programs show [SELECTOR]`
 
@@ -169,7 +170,7 @@ DESCRIPTION
   Show one program hierarchy
 ```
 
-_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/programs/show.ts)_
+_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/programs/show.ts)_
 
 ## `cliftin routines from-workout [WORKOUTID]`
 
@@ -189,7 +190,7 @@ DESCRIPTION
   Show the planned routine for a completed workout
 ```
 
-_See code: [src/commands/routines/from-workout.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/routines/from-workout.ts)_
+_See code: [src/commands/routines/from-workout.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/from-workout.ts)_
 
 ## `cliftin routines latest`
 
@@ -206,7 +207,7 @@ DESCRIPTION
   Show the planned routine for the latest workout
 ```
 
-_See code: [src/commands/routines/latest.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/routines/latest.ts)_
+_See code: [src/commands/routines/latest.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/latest.ts)_
 
 ## `cliftin routines list`
 
@@ -228,7 +229,7 @@ DESCRIPTION
   List planned routines
 ```
 
-_See code: [src/commands/routines/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/routines/list.ts)_
+_See code: [src/commands/routines/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/list.ts)_
 
 ## `cliftin routines next`
 
@@ -245,7 +246,7 @@ DESCRIPTION
   Show the up-next routine from the active program
 ```
 
-_See code: [src/commands/routines/next.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/routines/next.ts)_
+_See code: [src/commands/routines/next.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/next.ts)_
 
 ## `cliftin routines show SELECTOR`
 
@@ -265,7 +266,7 @@ DESCRIPTION
   Show one planned routine
 ```
 
-_See code: [src/commands/routines/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/routines/show.ts)_
+_See code: [src/commands/routines/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/show.ts)_
 
 ## `cliftin workouts list`
 
@@ -292,7 +293,7 @@ DESCRIPTION
   List workouts
 ```
 
-_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/workouts/list.ts)_
+_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/workouts/list.ts)_
 
 ## `cliftin workouts next`
 
@@ -309,7 +310,7 @@ DESCRIPTION
   Redirect to routines next
 ```
 
-_See code: [src/commands/workouts/next.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/workouts/next.ts)_
+_See code: [src/commands/workouts/next.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/workouts/next.ts)_
 
 ## `cliftin workouts show [WORKOUTID]`
 
@@ -317,11 +318,14 @@ Show one workout with exercises and sets
 
 ```
 USAGE
-  $ cliftin workouts show [WORKOUTID] [--json]
+  $ cliftin workouts show [WORKOUTID] [--json] [--no-warmup]
 
 ARGUMENTS
   [WORKOUTID]  workout id (default: latest workout)
 
+FLAGS
+  --no-warmup  Hide warmup sets from output
+
 GLOBAL FLAGS
   --json  Format output as json.
 
@@ -329,5 +333,5 @@ DESCRIPTION
   Show one workout with exercises and sets
 ```
 
-_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.0.0/src/commands/workouts/show.ts)_
+_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/workouts/show.ts)_
 <!-- commandsstop -->

package/dist/commands/exercises/show.d.ts

@@ -13,6 +13,7 @@ export default class ExercisesShow extends Command {
         'max-weight': import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'min-reps': import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'min-weight': import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'no-warmup': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         program: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         routine: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         to: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/dist/commands/exercises/show.js

@@ -40,6 +40,7 @@ export default class ExercisesShow extends Command {
         'max-weight': Flags.integer({ description: 'History max top weight' }),
         'min-reps': Flags.integer({ description: 'History min top reps' }),
         'min-weight': Flags.integer({ description: 'History min top weight' }),
+        'no-warmup': Flags.boolean({ description: 'Hide warmup sets from output' }),
         program: Flags.string({ description: 'History filter by program id or name' }),
         routine: Flags.string({ description: 'History filter by routine id or name' }),
         to: Flags.string({ description: 'History end date YYYY-MM-DD' }),
@@ -58,7 +59,9 @@ export default class ExercisesShow extends Command {
                 const historyUnitPreference = await resolveExerciseWeightUnit(context.db, exerciseId);
                 const history = (await getExerciseHistoryWithSetsRows(context.db, exerciseId, historyFilters)).map((row) => ({
                     ...row,
-                    sets: row.sets.map((set) => ({
+                    sets: row.sets
+                        .filter((set) => (parsedFlags['no-warmup'] ? !set.isWarmup : true))
+                        .map((set) => ({
                         ...set,
                         weight: withWeightUnit(set.weight, historyUnitPreference),
                     })),
@@ -92,7 +95,7 @@ export default class ExercisesShow extends Command {
             this.log(`Program: ${lastPerformedSnapshot.workout.program ?? 'n/a'}`);
             this.log(`Date: ${formatWorkoutDate(lastPerformedSnapshot.workout.date)}`);
             this.log('');
-            this.log(renderTable(lastPerformedSnapshot.exercise.sets.map((set) => ({
+            this.log(renderTable(lastPerformedSnapshot.exercise.sets.filter((set) => (parsedFlags['no-warmup'] ? !set.isWarmup : true)).map((set) => ({
                 id: set.id,
                 isWarmup: set.isWarmup,
                 reps: set.reps,

package/dist/commands/workouts/show.d.ts

@@ -5,5 +5,8 @@ export default class WorkoutsShow extends Command {
     };
     static description: string;
     static enableJsonFlag: boolean;
+    static flags: {
+        'no-warmup': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<unknown | void>;
 }

package/dist/commands/workouts/show.js

@@ -1,4 +1,4 @@
-import { Args, Command } from '@oclif/core';
+import { Args, Command, Flags } from '@oclif/core';
 import { format, isValid, parseISO } from 'date-fns';
 import { closeDb, openDb } from '../../lib/db.js';
 import { serializeWorkoutDetailWithWeightUnits } from '../../lib/json-weight.js';
@@ -18,14 +18,28 @@ function formatWorkoutDate(dateIso) {
         return dateIso;
     return format(parsed, 'yyyy-MM-dd HH:mm');
 }
+function maybeExcludeWarmupSets(detail, omitWarmups) {
+    if (!omitWarmups)
+        return detail;
+    return {
+        ...detail,
+        exercises: detail.exercises.map((exercise) => ({
+            ...exercise,
+            sets: exercise.sets.filter((set) => !set.isWarmup),
+        })),
+    };
+}
 export default class WorkoutsShow extends Command {
     static args = {
         workoutId: Args.string({ description: 'workout id (default: latest workout)', ignoreStdin: true, required: false }),
     };
     static description = 'Show one workout with exercises and sets';
     static enableJsonFlag = true;
+    static flags = {
+        'no-warmup': Flags.boolean({ description: 'Hide warmup sets from output' }),
+    };
     async run() {
-        const { args } = await this.parse(WorkoutsShow);
+        const { args, flags } = await this.parse(WorkoutsShow);
         const context = openDb();
         try {
             if (args.workoutId !== undefined && !/^\d+$/.test(args.workoutId)) {
@@ -38,7 +52,7 @@ export default class WorkoutsShow extends Command {
                         throw new Error('No workouts found.');
                     return rows[0].id;
                 });
-            const detail = await getWorkoutDetail(context.db, workoutId);
+            const detail = maybeExcludeWarmupSets(await getWorkoutDetail(context.db, workoutId), flags['no-warmup']);
             const unitPreference = await resolveGlobalWeightUnit(context.db);
             const unitLabel = weightUnitLabel(unitPreference);
             if (this.jsonEnabled()) {

package/oclif.manifest.json

@@ -139,6 +139,12 @@
           "multiple": false,
           "type": "option"
         },
+        "no-warmup": {
+          "description": "Hide warmup sets from output",
+          "name": "no-warmup",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "program": {
           "description": "History filter by program id or name",
           "name": "program",
@@ -558,6 +564,12 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "no-warmup": {
+          "description": "Hide warmup sets from output",
+          "name": "no-warmup",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -577,5 +589,5 @@
       ]
     }
   },
-  "version": "4.0.0"
+  "version": "4.1.0"
 }

package/package.json

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