@nickchristensen/cliftin 1.1.1 → 1.3.0

package/README.md

@@ -5,8 +5,8 @@ CLIftin: A read-only CLI for Liftin'
 
 
 [![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
-[![Version](https://img.shields.io/npm/v/@nickchristensen/cliftin.svg)](https://npmjs.org/package/cliftin)
-[![Downloads/week](https://img.shields.io/npm/dw/@nickchristensen/cliftin.svg)](https://npmjs.org/package/cliftin)
+[![Version](https://img.shields.io/npm/v/@nickchristensen/cliftin.svg)](https://npmjs.org/package/@nickchristensen/cliftin)
+[![Downloads/week](https://img.shields.io/npm/dw/@nickchristensen/cliftin.svg)](https://npmjs.org/package/@nickchristensen/cliftin)
 
 
 <!-- toc -->
@@ -47,7 +47,8 @@ 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 next`](#cliftin-workouts-next)
+* [`cliftin workouts show [WORKOUTID]`](#cliftin-workouts-show-workoutid)
 
 ## `cliftin exercises list`
 
@@ -72,7 +73,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.3.0/src/commands/exercises/list.ts)_
 
 ## `cliftin exercises show SELECTOR`
 
@@ -106,7 +107,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.3.0/src/commands/exercises/show.ts)_
 
 ## `cliftin help [COMMAND]`
 
@@ -143,7 +144,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.3.0/src/commands/programs/list.ts)_
 
 ## `cliftin programs show [SELECTOR]`
 
@@ -151,14 +152,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 +164,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.3.0/src/commands/programs/show.ts)_
 
 ## `cliftin workouts list`
 
@@ -194,18 +191,35 @@ 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.3.0/src/commands/workouts/list.ts)_
+
+## `cliftin workouts next`
+
+Show the up-next routine from the active program
+
+```
+USAGE
+  $ cliftin workouts next [--json]
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+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.0/src/commands/workouts/next.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 +228,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.3.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/next.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@oclif/core';
+export default class WorkoutsNext extends Command {
+    static description: string;
+    static enableJsonFlag: boolean;
+    run(): Promise<unknown | void>;
+}

package/dist/commands/workouts/next.js

@@ -0,0 +1,44 @@
+import { Command } from '@oclif/core';
+import { closeDb, openDb } from '../../lib/db.js';
+import { toJsonErrorPayload } from '../../lib/json-error.js';
+import { serializeNextWorkoutDetailWithWeightUnits } from '../../lib/json-weight.js';
+import { renderTable } from '../../lib/output.js';
+import { getNextWorkoutDetail } from '../../lib/repositories/workouts.js';
+import { resolveProgramWeightUnit, weightUnitLabel } from '../../lib/units.js';
+export default class WorkoutsNext extends Command {
+    static description = 'Show the up-next routine from the active program';
+    static enableJsonFlag = true;
+    async run() {
+        await this.parse(WorkoutsNext);
+        const context = openDb();
+        try {
+            const detail = await getNextWorkoutDetail(context.db);
+            const unitPreference = await resolveProgramWeightUnit(context.db, detail.program.id);
+            const unitLabel = weightUnitLabel(unitPreference);
+            if (this.jsonEnabled()) {
+                return serializeNextWorkoutDetailWithWeightUnits(detail, unitPreference);
+            }
+            this.log(`[${detail.routine.id}] ${detail.routine.name ?? 'Workout'}`);
+            this.log(`Program: ${detail.program.name}`);
+            this.log(`Week: ${detail.week.number}`);
+            for (const exercise of detail.routine.exercises) {
+                this.log('');
+                this.log(`[${exercise.id ?? exercise.exerciseConfigId}] ${exercise.name ?? '(unnamed)'}`);
+                this.log(renderTable(exercise.sets.map((set) => ({
+                    reps: set.reps,
+                    rpe: set.rpe,
+                    timeSeconds: set.timeSeconds,
+                    weight: set.weight === null ? null : `${set.weight} ${unitLabel}`,
+                }))));
+            }
+        }
+        catch (error) {
+            if (this.jsonEnabled())
+                return toJsonErrorPayload(error);
+            throw error;
+        }
+        finally {
+            await closeDb(context);
+        }
+    }
+}

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)', ignoreStdin: true, 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/db.d.ts

@@ -60,6 +60,7 @@ export interface DatabaseSchema {
         ZNAME: null | string;
         ZPERIOD: null | number;
         ZSOFTDELETED: null | number;
+        ZUPNEXT: null | number;
         ZWORKOUTPLAN: null | number;
     };
     ZSETCONFIGURATION: {

package/dist/lib/json-weight.d.ts

@@ -1,7 +1,8 @@
-import { ExerciseHistoryRow, ProgramDetailTree, WorkoutDetail } from './types.js';
+import { ExerciseHistoryRow, NextWorkoutDetail, ProgramDetailTree, WorkoutDetail } from './types.js';
 import { UnitPreference, withWeightUnit } from './units.js';
 export declare function serializeExerciseHistoryRowsWithWeightUnits(rows: ExerciseHistoryRow[], unitPreference: UnitPreference): Array<Omit<ExerciseHistoryRow, 'topWeight'> & {
     topWeight: ReturnType<typeof withWeightUnit>;
 }>;
 export declare function serializeProgramDetailWithWeightUnits(detail: ProgramDetailTree, unitPreference: UnitPreference): unknown;
+export declare function serializeNextWorkoutDetailWithWeightUnits(detail: NextWorkoutDetail, unitPreference: UnitPreference): unknown;
 export declare function serializeWorkoutDetailWithWeightUnits(detail: WorkoutDetail, unitPreference: UnitPreference): unknown;

package/dist/lib/json-weight.js

@@ -24,6 +24,22 @@ export function serializeProgramDetailWithWeightUnits(detail, unitPreference) {
         })),
     };
 }
+export function serializeNextWorkoutDetailWithWeightUnits(detail, unitPreference) {
+    return {
+        ...detail,
+        routine: {
+            ...detail.routine,
+            exercises: detail.routine.exercises.map((exercise) => ({
+                ...exercise,
+                plannedWeight: withWeightUnit(exercise.plannedWeight, unitPreference),
+                sets: exercise.sets.map((set) => ({
+                    ...set,
+                    weight: withWeightUnit(set.weight, unitPreference),
+                })),
+            })),
+        },
+    };
+}
 export function serializeWorkoutDetailWithWeightUnits(detail, unitPreference) {
     return {
         ...detail,

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.d.ts

@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
 import { DatabaseSchema } from '../db.js';
-import { WorkoutDetail, WorkoutSummary } from '../types.js';
+import { NextWorkoutDetail, WorkoutDetail, WorkoutSummary } from '../types.js';
 export type WorkoutFilters = {
     from?: string;
     limit?: number;
@@ -9,5 +9,6 @@ export type WorkoutFilters = {
     routine?: string;
     to?: string;
 };
+export declare function getNextWorkoutDetail(db: Kysely<DatabaseSchema>): Promise<NextWorkoutDetail>;
 export declare function listWorkouts(db: Kysely<DatabaseSchema>, filters: WorkoutFilters): Promise<WorkoutSummary[]>;
 export declare function getWorkoutDetail(db: Kysely<DatabaseSchema>, workoutId: number): Promise<WorkoutDetail>;

package/dist/lib/repositories/workouts.js

@@ -2,10 +2,50 @@ import { formatExerciseDisplayName } from '../names.js';
 import { normalizeRpe } from '../rpe.js';
 import { appleSecondsToIso, dateRangeToAppleSeconds } from '../time.js';
 import { convertKgToDisplayVolume, convertKgToDisplayWeight, resolveGlobalWeightUnit } from '../units.js';
+import { getProgramDetail, resolveProgramSelector } from './programs.js';
 import { resolveIdOrName } from './selectors.js';
 function asBool(value) {
     return value === 1;
 }
+export async function getNextWorkoutDetail(db) {
+    const programId = await resolveProgramSelector(db, undefined, true);
+    const programDetail = await getProgramDetail(db, programId);
+    const nextRoutines = await db
+        .selectFrom('ZROUTINE as r')
+        .leftJoin('ZPERIOD as p', 'p.Z_PK', 'r.ZPERIOD')
+        .select(['r.Z_PK as id', 'r.ZPERIOD as weekId'])
+        .where('r.ZUPNEXT', '=', 1)
+        .where('r.ZSOFTDELETED', 'is not', 1)
+        .where((eb) => eb.or([eb('p.ZWORKOUTPLAN', '=', programId), eb('r.ZWORKOUTPLAN', '=', programId)]))
+        .orderBy('p.Z_FOK_WORKOUTPLAN', 'asc')
+        .orderBy('r.Z_FOK_PERIOD', 'asc')
+        .orderBy('r.Z_PK', 'asc')
+        .execute();
+    if (nextRoutines.length === 0) {
+        throw new Error(`No up-next routine found for active program ${programDetail.program.name}.`);
+    }
+    if (nextRoutines.length > 1) {
+        throw new Error(`Expected exactly one up-next routine for active program ${programDetail.program.name}. Found ${nextRoutines.length}.`);
+    }
+    const nextRoutine = nextRoutines[0];
+    const weekIndex = programDetail.weeks.findIndex((week) => week.id === nextRoutine.weekId);
+    if (weekIndex === -1) {
+        throw new Error(`Up-next routine ${nextRoutine.id} is linked to unknown week ${nextRoutine.weekId}.`);
+    }
+    const week = programDetail.weeks[weekIndex];
+    const routine = week.routines.find((entry) => entry.id === nextRoutine.id);
+    if (!routine) {
+        throw new Error(`Up-next routine ${nextRoutine.id} was not found in active program detail.`);
+    }
+    return {
+        program: programDetail.program,
+        routine,
+        week: {
+            id: week.id,
+            number: weekIndex + 1,
+        },
+    };
+}
 export async function listWorkouts(db, filters) {
     const dateRange = dateRangeToAppleSeconds({ from: filters.from, on: filters.on, to: filters.to });
     let query = db
@@ -73,7 +113,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/dist/lib/types.d.ts

@@ -68,6 +68,14 @@ export type WorkoutDetail = {
     program: null | string;
     routine: null | string;
 };
+export type NextWorkoutDetail = {
+    program: ProgramSummary;
+    routine: ProgramRoutine;
+    week: {
+        id: number;
+        number: number;
+    };
+};
 export type ExerciseSummary = {
     equipment: null | string;
     id: number;

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,
@@ -346,13 +334,42 @@
         "list.js"
       ]
     },
+    "workouts:next": {
+      "aliases": [],
+      "args": {},
+      "description": "Show the up-next routine from the active program",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "workouts:next",
+      "pluginAlias": "@nickchristensen/cliftin",
+      "pluginName": "@nickchristensen/cliftin",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workouts",
+        "next.js"
+      ]
+    },
     "workouts:show": {
       "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 +399,5 @@
       ]
     }
   },
-  "version": "1.1.1"
+  "version": "1.3.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.3.0",
   "author": "Nick Christensen",
   "bin": {
     "cliftin": "./bin/run.js"