@nickchristensen/cliftin 1.1.1 → 1.2.0

package/README.md

@@ -47,7 +47,7 @@ USAGE
 * [`cliftin programs list`](#cliftin-programs-list)
 * [`cliftin programs show [SELECTOR]`](#cliftin-programs-show-selector)
 * [`cliftin workouts list`](#cliftin-workouts-list)
-* [`cliftin workouts show WORKOUTID`](#cliftin-workouts-show-workoutid)
+* [`cliftin workouts show [WORKOUTID]`](#cliftin-workouts-show-workoutid)
 
 ## `cliftin exercises list`
 
@@ -72,7 +72,7 @@ DESCRIPTION
   List exercises
 ```
 
-_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v1.1.1/src/commands/exercises/list.ts)_
+_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v1.2.0/src/commands/exercises/list.ts)_
 
 ## `cliftin exercises show SELECTOR`
 
@@ -106,7 +106,7 @@ DESCRIPTION
   Show one exercise detail and history
 ```
 
-_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v1.1.1/src/commands/exercises/show.ts)_
+_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v1.2.0/src/commands/exercises/show.ts)_
 
 ## `cliftin help [COMMAND]`
 
@@ -143,7 +143,7 @@ DESCRIPTION
   List programs
 ```
 
-_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v1.1.1/src/commands/programs/list.ts)_
+_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v1.2.0/src/commands/programs/list.ts)_
 
 ## `cliftin programs show [SELECTOR]`
 
@@ -151,14 +151,10 @@ Show one program hierarchy
 
 ```
 USAGE
-  $ cliftin programs show [SELECTOR] [--json] [--active] [--current]
+  $ cliftin programs show [SELECTOR] [--json]
 
 ARGUMENTS
-  [SELECTOR]  program id or name
-
-FLAGS
-  --active   Show active program detail
-  --current  Alias for --active
+  [SELECTOR]  program id or name (default: active program)
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -167,7 +163,7 @@ DESCRIPTION
   Show one program hierarchy
 ```
 
-_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v1.1.1/src/commands/programs/show.ts)_
+_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v1.2.0/src/commands/programs/show.ts)_
 
 ## `cliftin workouts list`
 
@@ -194,18 +190,18 @@ DESCRIPTION
   List workouts
 ```
 
-_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v1.1.1/src/commands/workouts/list.ts)_
+_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v1.2.0/src/commands/workouts/list.ts)_
 
-## `cliftin workouts show WORKOUTID`
+## `cliftin workouts show [WORKOUTID]`
 
 Show one workout with exercises and sets
 
 ```
 USAGE
-  $ cliftin workouts show WORKOUTID [--json]
+  $ cliftin workouts show [WORKOUTID] [--json]
 
 ARGUMENTS
-  WORKOUTID  workout id
+  [WORKOUTID]  workout id (default: latest workout)
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -214,5 +210,5 @@ DESCRIPTION
   Show one workout with exercises and sets
 ```
 
-_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v1.1.1/src/commands/workouts/show.ts)_
+_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v1.2.0/src/commands/workouts/show.ts)_
 <!-- commandsstop -->

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

@@ -5,9 +5,6 @@ export default class ProgramsShow extends Command {
     };
     static description: string;
     static enableJsonFlag: boolean;
-    static flags: {
-        active: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        current: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-    };
+    static flags: {};
     run(): Promise<unknown | void>;
 }

package/dist/commands/programs/show.js

@@ -1,4 +1,4 @@
-import { Args, Command, Flags } from '@oclif/core';
+import { Args, Command } from '@oclif/core';
 import { closeDb, openDb } from '../../lib/db.js';
 import { serializeProgramDetailWithWeightUnits } from '../../lib/json-weight.js';
 import { renderTable } from '../../lib/output.js';
@@ -30,26 +30,16 @@ function buildProgramRows(weeks, unitLabel) {
 }
 export default class ProgramsShow extends Command {
     static args = {
-        selector: Args.string({ description: 'program id or name', ignoreStdin: true, required: false }),
+        selector: Args.string({ description: 'program id or name (default: active program)', ignoreStdin: true, required: false }),
     };
     static description = 'Show one program hierarchy';
     static enableJsonFlag = true;
-    static flags = {
-        active: Flags.boolean({ description: 'Show active program detail' }),
-        current: Flags.boolean({ description: 'Alias for --active' }),
-    };
+    static flags = {};
     async run() {
-        const { args, flags } = await this.parse(ProgramsShow);
+        const { args } = await this.parse(ProgramsShow);
         const context = openDb();
         try {
-            const useActive = flags.active || flags.current;
-            if (args.selector && useActive) {
-                throw new Error('Use either a selector or --active/--current, not both.');
-            }
-            if (!args.selector && !useActive) {
-                throw new Error('Provide a selector or use --active/--current.');
-            }
-            const programId = await resolveProgramSelector(context.db, args.selector, Boolean(useActive));
+            const programId = await resolveProgramSelector(context.db, args.selector, !args.selector);
             const detail = await getProgramDetail(context.db, programId);
             const unitPreference = await resolveProgramWeightUnit(context.db, detail.program.id);
             const unitLabel = weightUnitLabel(unitPreference);
@@ -57,7 +47,8 @@ export default class ProgramsShow extends Command {
                 return serializeProgramDetailWithWeightUnits(detail, unitPreference);
             }
             this.log(`[${detail.program.id}] ${detail.program.name}`);
-            this.log(`Active: ${detail.program.isActive}  Template: ${detail.program.isTemplate}`);
+            this.log(`Active: ${detail.program.isActive}`);
+            this.log(`Template: ${detail.program.isTemplate}`);
             this.log('');
             const programRows = buildProgramRows(detail.weeks, unitLabel);
             const renderedTable = renderTable(programRows).replace(/^\n+/, '');

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

@@ -1,7 +1,7 @@
 import { Command } from '@oclif/core';
 export default class WorkoutsShow extends Command {
     static args: {
-        workoutId: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+        workoutId: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static description: string;
     static enableJsonFlag: boolean;

package/dist/commands/workouts/show.js

@@ -3,7 +3,7 @@ import { format, isValid, parseISO } from 'date-fns';
 import { closeDb, openDb } from '../../lib/db.js';
 import { serializeWorkoutDetailWithWeightUnits } from '../../lib/json-weight.js';
 import { renderTable } from '../../lib/output.js';
-import { getWorkoutDetail } from '../../lib/repositories/workouts.js';
+import { getWorkoutDetail, listWorkouts } from '../../lib/repositories/workouts.js';
 import { resolveGlobalWeightUnit, weightUnitLabel } from '../../lib/units.js';
 function formatDurationMinutes(durationSeconds) {
     if (durationSeconds === null)
@@ -20,7 +20,7 @@ function formatWorkoutDate(dateIso) {
 }
 export default class WorkoutsShow extends Command {
     static args = {
-        workoutId: Args.string({ description: 'workout id', required: true }),
+        workoutId: Args.string({ description: 'workout id (default: latest workout)', required: false }),
     };
     static description = 'Show one workout with exercises and sets';
     static enableJsonFlag = true;
@@ -28,10 +28,17 @@ export default class WorkoutsShow extends Command {
         const { args } = await this.parse(WorkoutsShow);
         const context = openDb();
         try {
-            if (!/^\d+$/.test(args.workoutId)) {
-                throw new Error('Workout detail requires numeric workout id.');
+            if (args.workoutId !== undefined && !/^\d+$/.test(args.workoutId)) {
+                throw new Error('Workout id must be numeric.');
             }
-            const detail = await getWorkoutDetail(context.db, Number(args.workoutId));
+            const workoutId = args.workoutId
+                ? Number(args.workoutId)
+                : await listWorkouts(context.db, { limit: 1 }).then((rows) => {
+                    if (rows.length === 0)
+                        throw new Error('No workouts found.');
+                    return rows[0].id;
+                });
+            const detail = await getWorkoutDetail(context.db, workoutId);
             const unitPreference = await resolveGlobalWeightUnit(context.db);
             const unitLabel = weightUnitLabel(unitPreference);
             if (this.jsonEnabled()) {

package/dist/lib/repositories/programs.js

@@ -54,7 +54,7 @@ export async function resolveProgramSelector(db, selector, activeOnly) {
         return fallbackRows[0].id;
     }
     if (!selector)
-        throw new Error('Program selector is required unless --active/--current is set.');
+        throw new Error('Program selector is required.');
     const programId = await resolveIdOrName(db, 'ZWORKOUTPLAN', selector);
     const nonDeleted = await db
         .selectFrom('ZWORKOUTPLAN')

package/dist/lib/repositories/workouts.js

@@ -73,7 +73,12 @@ export async function getWorkoutDetail(db, workoutId) {
         .selectFrom('ZEXERCISERESULT as er')
         .leftJoin('ZEXERCISECONFIGURATION as ec', 'ec.Z_PK', 'er.ZCONFIGURATION')
         .leftJoin('ZEXERCISEINFORMATION as ei', 'ei.Z_PK', 'ec.ZINFORMATION')
-        .select(['er.Z_PK as exerciseResultId', 'ei.Z_PK as exerciseId', 'ei.ZISUSERCREATED as isUserCreated', 'ei.ZNAME as exerciseName'])
+        .select([
+        'er.Z_PK as exerciseResultId',
+        'ei.Z_PK as exerciseId',
+        'ei.ZISUSERCREATED as isUserCreated',
+        'ei.ZNAME as exerciseName',
+    ])
         .where('er.ZWORKOUT', '=', workoutId)
         .orderBy('er.Z_FOK_WORKOUT', 'asc')
         .orderBy('er.Z_PK', 'asc')

package/oclif.manifest.json

@@ -210,7 +210,7 @@
       "aliases": [],
       "args": {
         "selector": {
-          "description": "program id or name",
+          "description": "program id or name (default: active program)",
           "name": "selector",
           "required": false
         }
@@ -223,18 +223,6 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "active": {
-          "description": "Show active program detail",
-          "name": "active",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "current": {
-          "description": "Alias for --active",
-          "name": "current",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -350,9 +338,9 @@
       "aliases": [],
       "args": {
         "workoutId": {
-          "description": "workout id",
+          "description": "workout id (default: latest workout)",
           "name": "workoutId",
-          "required": true
+          "required": false
         }
       },
       "description": "Show one workout with exercises and sets",
@@ -382,5 +370,5 @@
       ]
     }
   },
-  "version": "1.1.1"
+  "version": "1.2.0"
 }

package/package.json

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