npm - @richhaase/c2 - Versions diffs - 0.3.0 → 0.3.2 - Mend

@richhaase/c2 0.3.0 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@richhaase/c2",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "CLI tool for syncing and analyzing Concept2 rowing data",
   "keywords": [
     "concept2",

package/src/commands/export.ts CHANGED Viewed

@@ -101,7 +101,6 @@ export function registerExport(program: Command): void {
         process.exit(1);
       }
-      // Sort oldest first for export
       workouts.sort((a, b) => a.date.localeCompare(b.date));
       switch (opts.format) {

package/src/commands/report.ts CHANGED Viewed

@@ -11,7 +11,9 @@ import {
   buildWeekSummaries,
   computeGoalProgress,
   type GoalProgress,
+  mondayOf,
   type WeekSummary,
+  workoutsInRange,
 } from "../stats.ts";
 import { readWorkouts } from "../storage.ts";
@@ -192,7 +194,6 @@ ${rows}
 }
 function buildWeeklyTrends(summaries: WeekSummary[]): string {
-  // Find best volume week and best pace week for highlighting
   let bestVolume = 0;
   let bestPace = Infinity;
   for (const ws of summaries) {
@@ -222,7 +223,6 @@ function buildWeeklyTrends(summaries: WeekSummary[]): string {
     })
     .join("\n");
-  // Pace trend summary
   const firstPace = summaries.find((w) => w.paceCount > 0);
   const lastPace = [...summaries].reverse().find((w) => w.paceCount > 0);
   let trendNote = "";
@@ -259,7 +259,6 @@ function buildRecentWorkouts(workouts: Workout[], count: number): string {
   const sorted = [...workouts].sort((a, b) => b.date.localeCompare(a.date));
   const recent = sorted.slice(0, count).reverse();
-  // Detect same-day groups for session-aware formatting
   const dayCounts = new Map<string, number>();
   for (const w of recent) {
     const day = calendarDay(w);
@@ -276,7 +275,6 @@ function buildRecentWorkouts(workouts: Workout[], count: number): string {
       const spm = w.stroke_rate ?? "-";
       const hr = w.heart_rate?.average ?? "-";
-      // If multiple workouts on same day, annotate
       const multiDay = (dayCounts.get(day) || 0) > 1;
       if (!multiDay) {
         return `      <tr>
@@ -288,16 +286,14 @@ function buildRecentWorkouts(workouts: Workout[], count: number): string {
       </tr>`;
       }
-      // Session-aware: short warmup/cooldown get muted style
       const isShort = w.distance <= 1500;
-      const isHard = paceS > 0 && paceS < 160; // sub-2:40 is hard
+      const isHard = paceS > 0 && paceS < 160; // sub-2:40
       let annotation = "";
       let rowStyle = "";
       let paceStyle = "";
       let hrStyle = "";
       if (isShort && !isHard) {
-        // Likely warmup or cooldown — check position
         const dayWorkouts = recent
           .filter((r) => calendarDay(r) === day)
           .sort((a, b) => a.date.localeCompare(b.date));
@@ -393,11 +389,12 @@ function buildHTML(
   goal: GoalProgress,
   summaries: WeekSummary[],
   allWorkouts: Workout[],
+  windowedWorkouts: Workout[],
   recentCount: number,
 ): string {
-  const sessions = sessionCount(allWorkouts);
-  const avgPace = avgPaceForWorkouts(allWorkouts);
-  const avgHR = avgHRForWorkouts(allWorkouts);
+  const sessions = sessionCount(windowedWorkouts);
+  const avgPace = avgPaceForWorkouts(windowedWorkouts);
+  const avgHR = avgHRForWorkouts(windowedWorkouts);
   const today = new Date();
   return `<!DOCTYPE html>
@@ -681,8 +678,13 @@ export function registerReport(program: Command): void {
         console.error("Error: --weeks must be a positive integer.");
         process.exit(1);
       }
-      const summaries = buildWeekSummaries(workouts, new Date(), weeks);
-      const html = buildHTML(goal, summaries, workouts, 10);
+      const now = new Date();
+      const summaries = buildWeekSummaries(workouts, now, weeks);
+      const thisMonday = mondayOf(now);
+      const cutoff = new Date(thisMonday);
+      cutoff.setDate(cutoff.getDate() - (weeks - 1) * 7);
+      const windowedWorkouts = workoutsInRange(workouts, cutoff, now);
+      const html = buildHTML(goal, summaries, workouts, windowedWorkouts, 10);
       let outPath: string;
       if (opts.output) {

package/src/commands/setup.ts CHANGED Viewed

@@ -39,11 +39,9 @@ export function registerSetup(program: Command): void {
       console.log("Concept2 CLI Setup\n");
-      // Token
       const token = promptValue("API token (from log.concept2.com)", cfg.api.token, true);
       cfg.api.token = token;
-      // Goal target
       const targetDisplay = formatMeters(cfg.goal.target_meters);
       const targetInput = promptValue("Goal target meters", targetDisplay);
       const parsed = parseInt(targetInput.replace(/,/g, ""), 10);
@@ -51,7 +49,6 @@ export function registerSetup(program: Command): void {
         cfg.goal.target_meters = parsed;
       }
-      // Goal dates
       const startInput = promptValue("Goal start date (YYYY-MM-DD)", cfg.goal.start_date);
       try {
         parseGoalDate(startInput);
@@ -68,7 +65,6 @@ export function registerSetup(program: Command): void {
         console.log(`Invalid date "${endInput}", keeping previous value.`);
       }
-      // Save
       await ensureDirs();
       await saveConfig(cfg);
       console.log(`\nConfig written to ${join(configDir(), "config.json")}`);
@@ -79,7 +75,6 @@ export function registerSetup(program: Command): void {
         );
       }
-      // Verify token
       if (cfg.api.token) {
         console.log("Verifying token...");
         try {

package/src/display.ts CHANGED Viewed

@@ -14,7 +14,6 @@ export function formatMetersPerWeek(m: number): string {
 }
 export function formatDate(d: Date, fmt: string): string {
-  // Go-style reference time: "01/02" means month/day
   if (fmt === "01/02" || fmt === "%m/%d") {
     const mm = String(d.getMonth() + 1).padStart(2, "0");
     const dd = String(d.getDate()).padStart(2, "0");
@@ -26,21 +25,11 @@ export function formatDate(d: Date, fmt: string): string {
     const dd = String(d.getDate()).padStart(2, "0");
     return `${y}-${mm}-${dd}`;
   }
-  // Fallback: MM/DD
   const mm = String(d.getMonth() + 1).padStart(2, "0");
   const dd = String(d.getDate()).padStart(2, "0");
   return `${mm}/${dd}`;
 }
-/**
- * Format an interval-workout marker suffix for `formatWorkoutLine`.
- *
- * For interval workouts, appends a compact `[IVL rest M:SS.S]` tag that
- * flags the workout as intervals and reports the total rest duration so
- * the reader can reconcile `time_formatted` (elapsed including rest)
- * against `pace500m` (work-only pace). For non-interval workouts, returns
- * an empty string.
- */
 export function formatIntervalTag(w: Workout): string {
   if (!isIntervalWorkout(w)) return "";
   const rest = restSeconds(w);

package/src/index.ts CHANGED Viewed

@@ -23,7 +23,6 @@ registerTrend(program);
 registerExport(program);
 registerReport(program);
-// Default to `report` when run with no subcommand
 const args = process.argv.slice(2);
 const knownCommands = program.commands.map((c) => c.name());
 const hasSubcommand = args.some((a) => knownCommands.includes(a));

package/src/models.ts CHANGED Viewed

@@ -4,20 +4,6 @@ export interface HeartRate {
   max?: number;
 }
-/**
- * A single result from the Concept2 Logbook API.
- *
- * Time fields are in tenths of a second. For interval workouts (those with
- * `rest_time > 0` or a `workout_type` containing "Interval"):
- * - `time` is **work time only** (total across all reps, excluding rest)
- * - `time_formatted` is **elapsed time including rest**
- * - `distance` is total work meters (excluding rest rowing)
- *
- * This means pace (`time / distance`) is correctly work pace, but
- * `time_formatted` cannot be used for pace math on interval workouts.
- * Use `isIntervalWorkout()` to classify and `restSeconds()` to recover
- * elapsed vs work time when needed.
- */
 export interface Workout {
   id: number;
   user_id: number;
@@ -107,16 +93,6 @@ export function pace500m(w: Workout): string {
   return formatSeconds(secs);
 }
-/**
- * Returns true if this workout is an interval workout — i.e., multiple
- * work reps separated by rest. Interval workouts have `time` as work time
- * only and `time_formatted` as elapsed time including rest.
- *
- * Detection is inclusive: any of the following is sufficient.
- * - `workout_type` contains "Interval" (the Concept2 API's own classification)
- * - `rest_time` is > 0
- * - `rest_distance` is > 0
- */
 export function isIntervalWorkout(w: Workout): boolean {
   if (w.workout_type?.includes("Interval")) return true;
   if (w.rest_time != null && w.rest_time > 0) return true;
@@ -134,10 +110,6 @@ export function workSeconds(w: Workout): number {
   return w.time / TENTHS_PER_SECOND;
 }
-/**
- * Format a duration in seconds as `M:SS.S` (matching the Concept2 API's
- * `time_formatted` style). Returns `"0:00.0"` for zero.
- */
 export function formatSeconds(totalSeconds: number): string {
   if (totalSeconds <= 0) return "0:00.0";
   const mins = Math.floor(totalSeconds / 60);

package/src/stats.test.ts CHANGED Viewed

@@ -158,4 +158,32 @@ describe("computeGoalProgress", () => {
     expect(goal.weeksElapsed).toBe(0);
     expect(goal.currentAvgPace).toBe(0);
   });
+  test("currentAvgPace uses recent 4-week window, not lifetime", () => {
+    const cfg = makeGoalConfig();
+    const workouts = [
+      makeWorkout(1, "2026-01-05 10:00:00", 5_000),
+      makeWorkout(2, "2026-01-12 10:00:00", 8_000),
+      makeWorkout(3, "2026-01-19 10:00:00", 11_000),
+      makeWorkout(4, "2026-03-09 10:00:00", 20_000),
+      makeWorkout(5, "2026-03-16 10:00:00", 20_000),
+      makeWorkout(6, "2026-03-23 10:00:00", 20_000),
+      makeWorkout(7, "2026-03-30 10:00:00", 20_000),
+    ];
+    const now = new Date(2026, 2, 30, 18);
+    const goal = computeGoalProgress(workouts, cfg, now);
+    expect(goal.currentAvgPace).toBe(20_000);
+  });
+  test("currentAvgPace ignores workouts before the recent window", () => {
+    const cfg = makeGoalConfig();
+    const workouts = [
+      makeWorkout(1, "2026-01-05 10:00:00", 100_000),
+      makeWorkout(2, "2026-03-23 10:00:00", 15_000),
+      makeWorkout(3, "2026-03-30 10:00:00", 15_000),
+    ];
+    const now = new Date(2026, 2, 30, 18);
+    const goal = computeGoalProgress(workouts, cfg, now);
+    expect(goal.currentAvgPace).toBe(7_500);
+  });
 });

package/src/stats.ts CHANGED Viewed

@@ -24,10 +24,12 @@ export interface GoalProgress {
   remainingMeters: number;
   remainingWeeks: number;
   requiredPace: number; // meters/week needed going forward
-  currentAvgPace: number; // meters/week so far
+  currentAvgPace: number; // meters/week over the recent window
   onPace: boolean;
 }
+const RECENT_WEEKS = 4;
 export function mondayOf(t: Date): Date {
   const d = new Date(t.getFullYear(), t.getMonth(), t.getDate());
   const offset = (d.getDay() + 6) % 7;
@@ -132,7 +134,22 @@ export function computeGoalProgress(workouts: Workout[], cfg: Config, now?: Date
   if (remainingWeeks < 1) remainingWeeks = 1;
   const requiredPace = Math.floor(remainingMeters / remainingWeeks);
-  const currentAvgPace = weeksElapsed > 0 ? Math.floor(totalMeters / weeksElapsed) : 0;
+  let currentAvgPace = 0;
+  if (weeksElapsed > 0) {
+    const thisMonday = mondayOf(today);
+    const recentStart = new Date(thisMonday);
+    recentStart.setDate(recentStart.getDate() - (RECENT_WEEKS - 1) * 7);
+    const windowStart = recentStart < start ? start : recentStart;
+    let recentMeters = 0;
+    for (const w of workouts) {
+      const t = parsedDate(w);
+      if (t >= windowStart && t <= today) {
+        recentMeters += w.distance;
+      }
+    }
+    const weeksInWindow = Math.min(RECENT_WEEKS, Math.max(1, weeksElapsed));
+    currentAvgPace = Math.floor(recentMeters / weeksInWindow);
+  }
   const targetWeekly = target / totalWeeks;
   const onPace = currentAvgPace >= targetWeekly;