incyclist-services 1.7.77 → 1.7.78

package/lib/cjs/workouts/base/graph/series.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WORKOUT_ZONE_COLORS = void 0;
 exports.getStepDuration = getStepDuration;
 exports.getStepPower = getStepPower;
+exports.getStepTargetText = getStepTargetText;
+exports.getFlattenedSteps = getFlattenedSteps;
 exports.getWorkoutGraphSeries = getWorkoutGraphSeries;
 const model_1 = require("../model");
 exports.WORKOUT_ZONE_COLORS = [
@@ -95,6 +97,36 @@ function getStepPower(step, ftp) {
     const stepText = formatPowerText(low, high, unit, rangePrefix);
     return appendConvertedSuffix(stepText, low, high, unit, ftp);
 }
+function resolvePowerWatts(power, ftp) {
+    if (!power)
+        return {};
+    const toWatts = (v) => {
+        if (v === undefined)
+            return undefined;
+        if (power.type === 'watt')
+            return Math.round(v);
+        return ftp === undefined ? undefined : Math.round(v / 100 * ftp);
+    };
+    return { min: toWatts(power.min), max: toWatts(power.max) };
+}
+function formatRange(low, high, unit, rangePrefix = '') {
+    if (low !== undefined && high !== undefined && Math.round(low) !== Math.round(high))
+        return `${rangePrefix}${Math.round(low)}-${Math.round(high)}${unit}`;
+    const v = high ?? low;
+    return v === undefined ? '' : `${Math.round(v)}${unit}`;
+}
+function getStepTargetText(step, ftp, powerOverrideWatts) {
+    const { min: minPower, max: maxPower } = powerOverrideWatts ?? resolvePowerWatts(step.power, ftp);
+    const ascending = step.steady || step.cooldown === false;
+    const lowPower = ascending ? minPower : maxPower;
+    const highPower = ascending ? maxPower : minPower;
+    const rangePrefix = step.steady ? '' : 'Ramp ';
+    const powerText = formatRange(lowPower, highPower, 'W', rangePrefix);
+    const hrText = formatRange(step.hrm?.min, step.hrm?.max, 'HR');
+    const cadenceText = formatRange(step.cadence?.min, step.cadence?.max, ' rpm');
+    const parts = [powerText, hrText, cadenceText].filter(Boolean);
+    return parts.length ? parts.join(' at ') : 'free';
+}
 function coerceToWorkout(workout) {
     if (workout instanceof model_1.Workout)
         return workout;
@@ -139,15 +171,27 @@ function buildRampBars(wo, step, stepStart, ftp, absValues) {
     }
     return bars;
 }
-function getWorkoutGraphSeries(workout, opts) {
-    const { ftp, absValues = false } = opts ?? {};
+function getFlattenedSteps(workout) {
     const wo = coerceToWorkout(workout);
     if (!wo)
         return [];
-    const bars = [];
+    const result = [];
     let stepStart = 0;
     for (let limits = wo.getLimits(0, true); limits !== undefined; limits = wo.getLimits(stepStart + 0.01, true)) {
         const step = limits.step;
+        const duration = step.getDuration();
+        result.push({ step, start: stepStart, end: stepStart + duration, duration });
+        stepStart += duration;
+    }
+    return result;
+}
+function getWorkoutGraphSeries(workout, opts) {
+    const { ftp, absValues = false } = opts ?? {};
+    const wo = coerceToWorkout(workout);
+    if (!wo)
+        return [];
+    const bars = [];
+    getFlattenedSteps(wo).forEach(({ step, start: stepStart }) => {
         if (step.steady) {
             const bar = buildSteadyBar(step, stepStart, ftp, absValues);
             if (bar)
@@ -156,7 +200,6 @@ function getWorkoutGraphSeries(workout, opts) {
         else {
             bars.push(...buildRampBars(wo, step, stepStart, ftp, absValues));
         }
-        stepStart += step.getDuration();
-    }
+    });
     return bars;
 }

package/lib/cjs/workouts/ride/page/service.js

@@ -383,48 +383,46 @@ let WorkoutRidePageService = (() => {
             };
         }
         buildUpcomingSteps(current, ftp) {
+            const empty = { previous: null, current: null, upcoming: [], hasMore: false };
             if (!current)
-                return { current: null, upcoming: [] };
+                return empty;
             const limits = this.getWorkoutRide().getCurrentLimits();
             if (!limits)
-                return { current: null, upcoming: [] };
+                return empty;
             const currentStep = {
-                label: this.formatCurrentStepLabel(limits),
+                label: (0, graph_1.getStepTargetText)(limits.step ?? {}, ftp, { min: limits.minPower, max: limits.maxPower }),
                 targetPower: limits.targetPower ?? null,
                 duration: limits.duration,
                 remaining: limits.remaining,
                 isCurrent: true
             };
             const elapsedTime = this.getElapsedActivityTime();
-            const steps = current.steps ?? [];
-            const currentIndex = steps.findIndex(s => s.start <= elapsedTime && s.end > elapsedTime);
-            const upcoming = currentIndex === -1
-                ? []
-                : steps.slice(currentIndex + 1, currentIndex + 1 + UPCOMING_STEPS_COUNT).map(step => ({
-                    label: (0, graph_1.getStepPower)(step, ftp) || 'free',
-                    targetPower: this.getStepAbsolutePower(step, ftp),
-                    duration: step.duration,
-                    remaining: null,
-                    isCurrent: false
-                }));
-            return { current: currentStep, upcoming };
+            const flattened = (0, graph_1.getFlattenedSteps)(current);
+            const currentIndex = flattened.findIndex(s => s.start <= elapsedTime && s.end > elapsedTime);
+            const toDisplay = (entry) => ({
+                label: (0, graph_1.getStepTargetText)(entry.step, ftp),
+                targetPower: this.getStepAbsolutePower(entry.step, ftp),
+                duration: entry.duration,
+                remaining: null,
+                isCurrent: false
+            });
+            if (currentIndex === -1)
+                return { previous: null, current: currentStep, upcoming: [], hasMore: false };
+            const previous = currentIndex > 0 ? toDisplay(flattened[currentIndex - 1]) : null;
+            const upcomingEntries = flattened.slice(currentIndex + 1, currentIndex + 1 + UPCOMING_STEPS_COUNT);
+            const upcoming = upcomingEntries.map(toDisplay);
+            const hasMore = currentIndex + 1 + UPCOMING_STEPS_COUNT < flattened.length;
+            return { previous, current: currentStep, upcoming, hasMore };
         }
         buildDashboardLine(wo) {
             const limits = this.getWorkoutRide().getCurrentLimits();
-            return {
-                targetPower: limits?.targetPower ?? null,
-                targetDuration: limits?.duration ?? 0,
-                remaining: limits?.remaining ?? 0,
-                text: wo.title ?? '',
-                mode: wo.mode ?? null
-            };
-        }
-        formatCurrentStepLabel(limits) {
-            if (limits.targetPower === undefined || limits.targetPower === null)
-                return 'free';
-            if (limits.minPower !== undefined && limits.maxPower !== undefined && limits.minPower !== limits.maxPower)
-                return `${Math.round(limits.minPower)}-${Math.round(limits.maxPower)}W`;
-            return `${Math.round(limits.targetPower)}W`;
+            const title = wo.title ?? '';
+            if (!limits)
+                return { text: title, mode: wo.mode ?? null };
+            const target = (0, graph_1.getStepTargetText)(limits.step ?? {}, wo.ftp, { min: limits.minPower, max: limits.maxPower });
+            const duration = (0, graph_1.getStepDuration)({ duration: limits.duration });
+            const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
+            return { text, mode: wo.mode ?? null };
         }
         getStepAbsolutePower(step, ftp) {
             const p = step.power;
@@ -461,8 +459,8 @@ let WorkoutRidePageService = (() => {
                 startGateProps: null,
                 title: '',
                 graph: { bars: [], ftp: 0, ftpLine: 0, domain: { x: [0, 0], y: [0, 0] } },
-                steps: { current: null, upcoming: [] },
-                dashboard: { targetPower: null, targetDuration: 0, remaining: 0, text: '', mode: null }
+                steps: { previous: null, current: null, upcoming: [], hasMore: false },
+                dashboard: { text: '', mode: null }
             };
         }
         updatePageDisplay() {

package/lib/cjs/workouts/ride/service.js

@@ -498,7 +498,7 @@ let WorkoutRide = (() => {
             request.maxCadence = limits?.cadence?.max ? Math.round(limits.cadence.max) : undefined;
             request.minHrm = limits.hrm?.min ? Math.round(limits.hrm.min) : undefined;
             request.maxHrm = limits.hrm?.max ? Math.round(limits.hrm.max) : undefined;
-            this.currentLimits = { ...request, duration: limits.duration, remaining: limits.remaining };
+            this.currentLimits = { ...request, duration: limits.duration, remaining: limits.remaining, step: limits.step };
         }
         getZoomParameters(time) {
             let start, stop;

package/lib/esm/workouts/base/graph/series.js

@@ -89,6 +89,36 @@ export function getStepPower(step, ftp) {
     const stepText = formatPowerText(low, high, unit, rangePrefix);
     return appendConvertedSuffix(stepText, low, high, unit, ftp);
 }
+function resolvePowerWatts(power, ftp) {
+    if (!power)
+        return {};
+    const toWatts = (v) => {
+        if (v === undefined)
+            return undefined;
+        if (power.type === 'watt')
+            return Math.round(v);
+        return ftp === undefined ? undefined : Math.round(v / 100 * ftp);
+    };
+    return { min: toWatts(power.min), max: toWatts(power.max) };
+}
+function formatRange(low, high, unit, rangePrefix = '') {
+    if (low !== undefined && high !== undefined && Math.round(low) !== Math.round(high))
+        return `${rangePrefix}${Math.round(low)}-${Math.round(high)}${unit}`;
+    const v = high ?? low;
+    return v === undefined ? '' : `${Math.round(v)}${unit}`;
+}
+export function getStepTargetText(step, ftp, powerOverrideWatts) {
+    const { min: minPower, max: maxPower } = powerOverrideWatts ?? resolvePowerWatts(step.power, ftp);
+    const ascending = step.steady || step.cooldown === false;
+    const lowPower = ascending ? minPower : maxPower;
+    const highPower = ascending ? maxPower : minPower;
+    const rangePrefix = step.steady ? '' : 'Ramp ';
+    const powerText = formatRange(lowPower, highPower, 'W', rangePrefix);
+    const hrText = formatRange(step.hrm?.min, step.hrm?.max, 'HR');
+    const cadenceText = formatRange(step.cadence?.min, step.cadence?.max, ' rpm');
+    const parts = [powerText, hrText, cadenceText].filter(Boolean);
+    return parts.length ? parts.join(' at ') : 'free';
+}
 function coerceToWorkout(workout) {
     if (workout instanceof Workout)
         return workout;
@@ -133,15 +163,27 @@ function buildRampBars(wo, step, stepStart, ftp, absValues) {
     }
     return bars;
 }
-export function getWorkoutGraphSeries(workout, opts) {
-    const { ftp, absValues = false } = opts ?? {};
+export function getFlattenedSteps(workout) {
     const wo = coerceToWorkout(workout);
     if (!wo)
         return [];
-    const bars = [];
+    const result = [];
     let stepStart = 0;
     for (let limits = wo.getLimits(0, true); limits !== undefined; limits = wo.getLimits(stepStart + 0.01, true)) {
         const step = limits.step;
+        const duration = step.getDuration();
+        result.push({ step, start: stepStart, end: stepStart + duration, duration });
+        stepStart += duration;
+    }
+    return result;
+}
+export function getWorkoutGraphSeries(workout, opts) {
+    const { ftp, absValues = false } = opts ?? {};
+    const wo = coerceToWorkout(workout);
+    if (!wo)
+        return [];
+    const bars = [];
+    getFlattenedSteps(wo).forEach(({ step, start: stepStart }) => {
         if (step.steady) {
             const bar = buildSteadyBar(step, stepStart, ftp, absValues);
             if (bar)
@@ -150,7 +192,6 @@ export function getWorkoutGraphSeries(workout, opts) {
         else {
             bars.push(...buildRampBars(wo, step, stepStart, ftp, absValues));
         }
-        stepStart += step.getDuration();
-    }
+    });
     return bars;
 }

package/lib/esm/workouts/ride/page/service.js

@@ -39,7 +39,7 @@ import { IncyclistPageService } from "../../../base/pages";
 import { useRideDisplay } from "../../../ride/display";
 import { useActivityRide } from "../../../activities";
 import { useWorkoutRide } from "../service";
-import { getStepPower, getWorkoutGraphSeries } from "../../base/graph";
+import { getFlattenedSteps, getStepDuration, getStepTargetText, getWorkoutGraphSeries } from "../../base/graph";
 const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 const UPCOMING_STEPS_COUNT = 3;
 const DEFAULT_LOAD_INCREMENT = 1;
@@ -380,48 +380,46 @@ let WorkoutRidePageService = (() => {
             };
         }
         buildUpcomingSteps(current, ftp) {
+            const empty = { previous: null, current: null, upcoming: [], hasMore: false };
             if (!current)
-                return { current: null, upcoming: [] };
+                return empty;
             const limits = this.getWorkoutRide().getCurrentLimits();
             if (!limits)
-                return { current: null, upcoming: [] };
+                return empty;
             const currentStep = {
-                label: this.formatCurrentStepLabel(limits),
+                label: getStepTargetText(limits.step ?? {}, ftp, { min: limits.minPower, max: limits.maxPower }),
                 targetPower: limits.targetPower ?? null,
                 duration: limits.duration,
                 remaining: limits.remaining,
                 isCurrent: true
             };
             const elapsedTime = this.getElapsedActivityTime();
-            const steps = current.steps ?? [];
-            const currentIndex = steps.findIndex(s => s.start <= elapsedTime && s.end > elapsedTime);
-            const upcoming = currentIndex === -1
-                ? []
-                : steps.slice(currentIndex + 1, currentIndex + 1 + UPCOMING_STEPS_COUNT).map(step => ({
-                    label: getStepPower(step, ftp) || 'free',
-                    targetPower: this.getStepAbsolutePower(step, ftp),
-                    duration: step.duration,
-                    remaining: null,
-                    isCurrent: false
-                }));
-            return { current: currentStep, upcoming };
+            const flattened = getFlattenedSteps(current);
+            const currentIndex = flattened.findIndex(s => s.start <= elapsedTime && s.end > elapsedTime);
+            const toDisplay = (entry) => ({
+                label: getStepTargetText(entry.step, ftp),
+                targetPower: this.getStepAbsolutePower(entry.step, ftp),
+                duration: entry.duration,
+                remaining: null,
+                isCurrent: false
+            });
+            if (currentIndex === -1)
+                return { previous: null, current: currentStep, upcoming: [], hasMore: false };
+            const previous = currentIndex > 0 ? toDisplay(flattened[currentIndex - 1]) : null;
+            const upcomingEntries = flattened.slice(currentIndex + 1, currentIndex + 1 + UPCOMING_STEPS_COUNT);
+            const upcoming = upcomingEntries.map(toDisplay);
+            const hasMore = currentIndex + 1 + UPCOMING_STEPS_COUNT < flattened.length;
+            return { previous, current: currentStep, upcoming, hasMore };
         }
         buildDashboardLine(wo) {
             const limits = this.getWorkoutRide().getCurrentLimits();
-            return {
-                targetPower: limits?.targetPower ?? null,
-                targetDuration: limits?.duration ?? 0,
-                remaining: limits?.remaining ?? 0,
-                text: wo.title ?? '',
-                mode: wo.mode ?? null
-            };
-        }
-        formatCurrentStepLabel(limits) {
-            if (limits.targetPower === undefined || limits.targetPower === null)
-                return 'free';
-            if (limits.minPower !== undefined && limits.maxPower !== undefined && limits.minPower !== limits.maxPower)
-                return `${Math.round(limits.minPower)}-${Math.round(limits.maxPower)}W`;
-            return `${Math.round(limits.targetPower)}W`;
+            const title = wo.title ?? '';
+            if (!limits)
+                return { text: title, mode: wo.mode ?? null };
+            const target = getStepTargetText(limits.step ?? {}, wo.ftp, { min: limits.minPower, max: limits.maxPower });
+            const duration = getStepDuration({ duration: limits.duration });
+            const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
+            return { text, mode: wo.mode ?? null };
         }
         getStepAbsolutePower(step, ftp) {
             const p = step.power;
@@ -458,8 +456,8 @@ let WorkoutRidePageService = (() => {
                 startGateProps: null,
                 title: '',
                 graph: { bars: [], ftp: 0, ftpLine: 0, domain: { x: [0, 0], y: [0, 0] } },
-                steps: { current: null, upcoming: [] },
-                dashboard: { targetPower: null, targetDuration: 0, remaining: 0, text: '', mode: null }
+                steps: { previous: null, current: null, upcoming: [], hasMore: false },
+                dashboard: { text: '', mode: null }
             };
         }
         updatePageDisplay() {

package/lib/esm/workouts/ride/service.js

@@ -495,7 +495,7 @@ let WorkoutRide = (() => {
             request.maxCadence = limits?.cadence?.max ? Math.round(limits.cadence.max) : undefined;
             request.minHrm = limits.hrm?.min ? Math.round(limits.hrm.min) : undefined;
             request.maxHrm = limits.hrm?.max ? Math.round(limits.hrm.max) : undefined;
-            this.currentLimits = { ...request, duration: limits.duration, remaining: limits.remaining };
+            this.currentLimits = { ...request, duration: limits.duration, remaining: limits.remaining, step: limits.step };
         }
         getZoomParameters(time) {
             let start, stop;

package/lib/types/workouts/base/graph/series.d.ts

@@ -1,7 +1,18 @@
-import { Workout } from "../model";
+import { Step, Workout } from "../model";
 import { StepDefinition } from "../model/types";
 import { WorkoutGraphPlanBar, WorkoutGraphSeriesOptions } from "./types";
 export declare const WORKOUT_ZONE_COLORS: string[];
 export declare function getStepDuration(step: StepDefinition): string;
 export declare function getStepPower(step: StepDefinition, ftp?: number): string;
+export declare function getStepTargetText(step: StepDefinition, ftp?: number, powerOverrideWatts?: {
+    min?: number;
+    max?: number;
+}): string;
+export interface FlattenedStep {
+    step: Step;
+    start: number;
+    end: number;
+    duration: number;
+}
+export declare function getFlattenedSteps(workout: Workout): FlattenedStep[];
 export declare function getWorkoutGraphSeries(workout: Workout, opts?: WorkoutGraphSeriesOptions): WorkoutGraphPlanBar[];

package/lib/types/workouts/ride/page/service.d.ts

@@ -1,7 +1,7 @@
 import { IncyclistPageService } from "../../../base/pages";
 import type { IObserver } from "../../../base/typedefs";
 import type { CurrentRideState, RideType } from "../../../types";
-import type { ActiveWorkoutLimit, WorkoutDisplayProperties } from "../types";
+import type { WorkoutDisplayProperties } from "../types";
 import type { Workout } from "../../base/model";
 import type { StepDefinition } from "../../base/model/types";
 import type { IWorkoutRidePageService, WorkoutDashboardLine, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
@@ -51,7 +51,6 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     protected buildGraphPlan(current: Workout | undefined, ftp: number): WorkoutGraphPlan;
     protected buildUpcomingSteps(current: Workout | undefined, ftp: number): WorkoutUpcomingSteps;
     protected buildDashboardLine(wo: WorkoutDisplayProperties): WorkoutDashboardLine;
-    protected formatCurrentStepLabel(limits: ActiveWorkoutLimit): string;
     protected getStepAbsolutePower(step: StepDefinition, ftp?: number): number | null;
     protected getStepFlags(): {
         canStepBack: boolean;

package/lib/types/workouts/ride/page/types.d.ts

@@ -28,13 +28,12 @@ export interface WorkoutStepDisplay {
     isCurrent: boolean;
 }
 export interface WorkoutUpcomingSteps {
+    previous: WorkoutStepDisplay | null;
     current: WorkoutStepDisplay | null;
     upcoming: WorkoutStepDisplay[];
+    hasMore: boolean;
 }
 export interface WorkoutDashboardLine {
-    targetPower: number | null;
-    targetDuration: number;
-    remaining: number;
     text: string;
     mode: string | null;
 }

package/lib/types/workouts/ride/types.d.ts

@@ -1,4 +1,5 @@
 import { Workout } from "../base/model";
+import { StepDefinition } from "../base/model/types";
 export interface WorkoutRequest {
     time: number;
     minPower?: number;
@@ -12,6 +13,7 @@ export interface WorkoutRequest {
 export interface ActiveWorkoutLimit extends WorkoutRequest {
     duration: number;
     remaining: number;
+    step?: StepDefinition;
 }
 export interface WorkoutDisplayProperties {
     workout?: Workout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.77",
+  "version": "1.7.78",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },