@openlifelog/sdk 1.0.4 → 1.0.5

package/dist/index.js

@@ -702,6 +702,27 @@ function convertWorkoutDataToMetric(data, measurementSystem) {
   if (converted.sets && Array.isArray(converted.sets)) {
     converted.sets = convertSetsDataToMetric(converted.sets, measurementSystem);
   }
+  if (converted.updateSets && typeof converted.updateSets === "object") {
+    const convertedUpdateSets = {};
+    for (const [exerciseId, sets] of Object.entries(converted.updateSets)) {
+      if (Array.isArray(sets)) {
+        convertedUpdateSets[exerciseId] = convertSetsDataToMetric(sets, measurementSystem);
+      } else {
+        convertedUpdateSets[exerciseId] = sets;
+      }
+    }
+    converted.updateSets = convertedUpdateSets;
+  }
+  if (converted.updateExercises && Array.isArray(converted.updateExercises)) {
+    converted.updateExercises = converted.updateExercises.map(
+      (exercise) => convertWorkoutDataToMetric(exercise, measurementSystem)
+    );
+  }
+  if (converted.addExercises && Array.isArray(converted.addExercises)) {
+    converted.addExercises = converted.addExercises.map(
+      (exercise) => convertWorkoutDataToMetric(exercise, measurementSystem)
+    );
+  }
   if (converted.exercises && Array.isArray(converted.exercises)) {
     converted.exercises = converted.exercises.map(
       (exercise) => convertWorkoutDataToMetric(exercise, measurementSystem)
@@ -1505,7 +1526,8 @@ var WorkoutsResource = class {
    * Create a new workout template
    */
   async create(request) {
-    const response = await this.http.post("/v1/workouts", request);
+    const requestToSend = this.config.autoConvertUnits ? convertWorkoutDataToMetric(request, this.config.measurementSystem) : request;
+    const response = await this.http.post("/v1/workouts", requestToSend);
     if (this.config.autoConvertUnits) {
       return convertWorkoutDataFromMetric(response.data, this.config.measurementSystem);
     }
@@ -1515,7 +1537,8 @@ var WorkoutsResource = class {
    * Update a workout template
    */
   async update(workoutId, request) {
-    const response = await this.http.put(`/v1/workouts/${workoutId}`, request);
+    const requestToSend = this.config.autoConvertUnits ? convertWorkoutDataToMetric(request, this.config.measurementSystem) : request;
+    const response = await this.http.put(`/v1/workouts/${workoutId}`, requestToSend);
     if (this.config.autoConvertUnits) {
       return convertWorkoutDataFromMetric(response.data, this.config.measurementSystem);
     }
@@ -1983,11 +2006,18 @@ var MetricsResource = class {
   }
   /**
    * Update a metric event
-   * Note: metricKey cannot be changed, so we can't determine if this is a weight metric from the request alone.
-   * We'll convert the value assuming it follows the user's preference setting.
+   * Note: metricKey cannot be changed, so we need to fetch the event first to determine if it's a weight metric.
    */
   async updateEvent(eventId, request) {
-    const response = await this.http.put(`/v1/metric-events/${eventId}`, request);
+    const requestToSend = { ...request };
+    if (this.config.autoConvertUnits && requestToSend.value !== null && requestToSend.value !== void 0) {
+      const existingEvent = await this.getEvent(eventId);
+      const isWeightMetric = existingEvent.metricKey?.includes("weight") || existingEvent.metricKey?.includes("bodyweight");
+      if (isWeightMetric) {
+        requestToSend.value = WeightConverter.toMetric(requestToSend.value, this.config.measurementSystem);
+      }
+    }
+    const response = await this.http.put(`/v1/metric-events/${eventId}`, requestToSend);
     if (this.config.autoConvertUnits && response.data.value !== null && response.data.value !== void 0) {
       const isWeightMetric = response.data.metricKey?.includes("weight") || response.data.metricKey?.includes("bodyweight");
       if (isWeightMetric) {

package/dist/index.mjs

@@ -648,6 +648,27 @@ function convertWorkoutDataToMetric(data, measurementSystem) {
   if (converted.sets && Array.isArray(converted.sets)) {
     converted.sets = convertSetsDataToMetric(converted.sets, measurementSystem);
   }
+  if (converted.updateSets && typeof converted.updateSets === "object") {
+    const convertedUpdateSets = {};
+    for (const [exerciseId, sets] of Object.entries(converted.updateSets)) {
+      if (Array.isArray(sets)) {
+        convertedUpdateSets[exerciseId] = convertSetsDataToMetric(sets, measurementSystem);
+      } else {
+        convertedUpdateSets[exerciseId] = sets;
+      }
+    }
+    converted.updateSets = convertedUpdateSets;
+  }
+  if (converted.updateExercises && Array.isArray(converted.updateExercises)) {
+    converted.updateExercises = converted.updateExercises.map(
+      (exercise) => convertWorkoutDataToMetric(exercise, measurementSystem)
+    );
+  }
+  if (converted.addExercises && Array.isArray(converted.addExercises)) {
+    converted.addExercises = converted.addExercises.map(
+      (exercise) => convertWorkoutDataToMetric(exercise, measurementSystem)
+    );
+  }
   if (converted.exercises && Array.isArray(converted.exercises)) {
     converted.exercises = converted.exercises.map(
       (exercise) => convertWorkoutDataToMetric(exercise, measurementSystem)
@@ -1451,7 +1472,8 @@ var WorkoutsResource = class {
    * Create a new workout template
    */
   async create(request) {
-    const response = await this.http.post("/v1/workouts", request);
+    const requestToSend = this.config.autoConvertUnits ? convertWorkoutDataToMetric(request, this.config.measurementSystem) : request;
+    const response = await this.http.post("/v1/workouts", requestToSend);
     if (this.config.autoConvertUnits) {
       return convertWorkoutDataFromMetric(response.data, this.config.measurementSystem);
     }
@@ -1461,7 +1483,8 @@ var WorkoutsResource = class {
    * Update a workout template
    */
   async update(workoutId, request) {
-    const response = await this.http.put(`/v1/workouts/${workoutId}`, request);
+    const requestToSend = this.config.autoConvertUnits ? convertWorkoutDataToMetric(request, this.config.measurementSystem) : request;
+    const response = await this.http.put(`/v1/workouts/${workoutId}`, requestToSend);
     if (this.config.autoConvertUnits) {
       return convertWorkoutDataFromMetric(response.data, this.config.measurementSystem);
     }
@@ -1929,11 +1952,18 @@ var MetricsResource = class {
   }
   /**
    * Update a metric event
-   * Note: metricKey cannot be changed, so we can't determine if this is a weight metric from the request alone.
-   * We'll convert the value assuming it follows the user's preference setting.
+   * Note: metricKey cannot be changed, so we need to fetch the event first to determine if it's a weight metric.
    */
   async updateEvent(eventId, request) {
-    const response = await this.http.put(`/v1/metric-events/${eventId}`, request);
+    const requestToSend = { ...request };
+    if (this.config.autoConvertUnits && requestToSend.value !== null && requestToSend.value !== void 0) {
+      const existingEvent = await this.getEvent(eventId);
+      const isWeightMetric = existingEvent.metricKey?.includes("weight") || existingEvent.metricKey?.includes("bodyweight");
+      if (isWeightMetric) {
+        requestToSend.value = WeightConverter.toMetric(requestToSend.value, this.config.measurementSystem);
+      }
+    }
+    const response = await this.http.put(`/v1/metric-events/${eventId}`, requestToSend);
     if (this.config.autoConvertUnits && response.data.value !== null && response.data.value !== void 0) {
       const isWeightMetric = response.data.metricKey?.includes("weight") || response.data.metricKey?.includes("bodyweight");
       if (isWeightMetric) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openlifelog/sdk",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "TypeScript SDK for the OpenLifeLog API - A comprehensive fitness and nutrition tracking platform",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/resources/metrics.ts

@@ -172,11 +172,23 @@ export class MetricsResource {
 
   /**
    * Update a metric event
-   * Note: metricKey cannot be changed, so we can't determine if this is a weight metric from the request alone.
-   * We'll convert the value assuming it follows the user's preference setting.
+   * Note: metricKey cannot be changed, so we need to fetch the event first to determine if it's a weight metric.
    */
   async updateEvent(eventId: string, request: UpdateMetricEventRequest): Promise<MetricEvent> {
-    const response = await this.http.put<MetricEvent>(`/v1/metric-events/${eventId}`, request);
+    // Convert request value to metric before sending
+    const requestToSend = { ...request };
+
+    // If value is being updated, we need to convert it
+    // Since we can't determine the metric type from the request alone, we fetch the event first
+    if (this.config.autoConvertUnits && requestToSend.value !== null && requestToSend.value !== undefined) {
+      const existingEvent = await this.getEvent(eventId);
+      const isWeightMetric = existingEvent.metricKey?.includes('weight') || existingEvent.metricKey?.includes('bodyweight');
+      if (isWeightMetric) {
+        requestToSend.value = WeightConverter.toMetric(requestToSend.value, this.config.measurementSystem);
+      }
+    }
+
+    const response = await this.http.put<MetricEvent>(`/v1/metric-events/${eventId}`, requestToSend);
 
     // Convert response back to user preference
     if (this.config.autoConvertUnits && response.data.value !== null && response.data.value !== undefined) {

package/resources/workouts.ts

@@ -80,7 +80,11 @@ export class WorkoutsResource {
    * Create a new workout template
    */
   async create(request: CreateWorkoutRequest): Promise<Workout> {
-    const response = await this.http.post<Workout>('/v1/workouts', request);
+    const requestToSend = this.config.autoConvertUnits
+      ? convertWorkoutDataToMetric(request, this.config.measurementSystem)
+      : request;
+
+    const response = await this.http.post<Workout>('/v1/workouts', requestToSend);
 
     if (this.config.autoConvertUnits) {
       return convertWorkoutDataFromMetric(response.data, this.config.measurementSystem);
@@ -93,7 +97,11 @@ export class WorkoutsResource {
    * Update a workout template
    */
   async update(workoutId: string, request: UpdateWorkoutRequest): Promise<Workout> {
-    const response = await this.http.put<Workout>(`/v1/workouts/${workoutId}`, request);
+    const requestToSend = this.config.autoConvertUnits
+      ? convertWorkoutDataToMetric(request, this.config.measurementSystem)
+      : request;
+
+    const response = await this.http.put<Workout>(`/v1/workouts/${workoutId}`, requestToSend);
 
     if (this.config.autoConvertUnits) {
       return convertWorkoutDataFromMetric(response.data, this.config.measurementSystem);

package/utils/units.ts

@@ -438,6 +438,34 @@ export function convertWorkoutDataToMetric(
     converted.sets = convertSetsDataToMetric(converted.sets, measurementSystem);
   }
 
+  // Convert updateSets object (used in session updates)
+  // Format: { exerciseId: [setData, setData, ...] }
+  if (converted.updateSets && typeof converted.updateSets === 'object') {
+    const convertedUpdateSets: any = {};
+    for (const [exerciseId, sets] of Object.entries(converted.updateSets)) {
+      if (Array.isArray(sets)) {
+        convertedUpdateSets[exerciseId] = convertSetsDataToMetric(sets, measurementSystem);
+      } else {
+        convertedUpdateSets[exerciseId] = sets;
+      }
+    }
+    converted.updateSets = convertedUpdateSets;
+  }
+
+  // Convert updateExercises array (used in session updates)
+  if (converted.updateExercises && Array.isArray(converted.updateExercises)) {
+    converted.updateExercises = converted.updateExercises.map((exercise: any) =>
+      convertWorkoutDataToMetric(exercise, measurementSystem)
+    );
+  }
+
+  // Convert addExercises array (used in session updates)
+  if (converted.addExercises && Array.isArray(converted.addExercises)) {
+    converted.addExercises = converted.addExercises.map((exercise: any) =>
+      convertWorkoutDataToMetric(exercise, measurementSystem)
+    );
+  }
+
   // Convert exercises arrays (nested structures)
   if (converted.exercises && Array.isArray(converted.exercises)) {
     converted.exercises = converted.exercises.map((exercise: any) =>