@kaiord/fit 4.7.2 → 7.0.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { sportSchema, durationTypeSchema, createConsoleLogger, createFitParsingError, fileTypeSchema, workoutSchema, isRepetitionBlock, convertLengthToMeters, subSportSchema, lengthUnitSchema, FIT_TO_SWIM_STROKE, equipmentSchema, targetTypeSchema, targetUnitSchema, intensitySchema } from '@kaiord/core';
+import { sportSchema, durationTypeSchema, createConsoleLogger, createFitParsingError, fileTypeSchema, workoutSchema, isRepetitionBlock, convertLengthToMeters, subSportSchema, lengthUnitSchema, equipmentSchema, targetTypeSchema, FIT_TO_SWIM_STROKE, targetUnitSchema, intensitySchema } from '@kaiord/core';
 import { Stream, Decoder, Encoder, Profile } from '@garmin/fitsdk';
 import { z } from 'zod';
 
@@ -673,63 +673,6 @@ var fitMessageKeySchema = z.enum([
   "eventMesgs",
   "lapMesgs"
 ]);
-var fitEventSchema = z.enum([
-  "timer",
-  "workout",
-  "workoutStep",
-  "powerDown",
-  "powerUp",
-  "offCourse",
-  "session",
-  "lap",
-  "coursePoint",
-  "battery",
-  "virtualPartnerPace",
-  "hrHighAlert",
-  "hrLowAlert",
-  "speedHighAlert",
-  "speedLowAlert",
-  "cadHighAlert",
-  "cadLowAlert",
-  "powerHighAlert",
-  "powerLowAlert",
-  "recoveryHr",
-  "batteryLow",
-  "timeDurationAlert",
-  "distanceDurationAlert",
-  "calorieDurationAlert",
-  "activity",
-  "fitnessEquipment",
-  "length",
-  "userMarker",
-  "sportPoint",
-  "calibration",
-  "frontGearChange",
-  "rearGearChange",
-  "riderPositionChange",
-  "elevHighAlert",
-  "elevLowAlert"
-]);
-var fitEventTypeSchema = z.enum([
-  "start",
-  "stop",
-  "consecutiveDepreciated",
-  "marker",
-  "stopAll",
-  "beginDepreciated",
-  "endDepreciated",
-  "endAllDepreciated",
-  "stopDisable",
-  "stopDisableAll"
-]);
-var fitEventMessageSchema = z.object({
-  timestamp: z.number(),
-  event: fitEventSchema,
-  eventType: fitEventTypeSchema,
-  eventGroup: z.number().optional(),
-  data: z.number().optional(),
-  data16: z.number().optional()
-});
 
 // src/adapters/event/event-type-maps.ts
 var FIT_EVENT_TO_KRD_TYPE = {
@@ -793,6 +736,63 @@ var mapFitEventToKrd = (fit) => ({
   eventGroup: fit.eventGroup,
   data: fit.data
 });
+var fitEventSchema = z.enum([
+  "timer",
+  "workout",
+  "workoutStep",
+  "powerDown",
+  "powerUp",
+  "offCourse",
+  "session",
+  "lap",
+  "coursePoint",
+  "battery",
+  "virtualPartnerPace",
+  "hrHighAlert",
+  "hrLowAlert",
+  "speedHighAlert",
+  "speedLowAlert",
+  "cadHighAlert",
+  "cadLowAlert",
+  "powerHighAlert",
+  "powerLowAlert",
+  "recoveryHr",
+  "batteryLow",
+  "timeDurationAlert",
+  "distanceDurationAlert",
+  "calorieDurationAlert",
+  "activity",
+  "fitnessEquipment",
+  "length",
+  "userMarker",
+  "sportPoint",
+  "calibration",
+  "frontGearChange",
+  "rearGearChange",
+  "riderPositionChange",
+  "elevHighAlert",
+  "elevLowAlert"
+]);
+var fitEventTypeSchema = z.enum([
+  "start",
+  "stop",
+  "consecutiveDepreciated",
+  "marker",
+  "stopAll",
+  "beginDepreciated",
+  "endDepreciated",
+  "endAllDepreciated",
+  "stopDisable",
+  "stopDisableAll"
+]);
+var fitEventMessageSchema = z.object({
+  timestamp: z.number(),
+  event: fitEventSchema,
+  eventType: fitEventTypeSchema,
+  eventGroup: z.number().optional(),
+  data: z.number().optional(),
+  data16: z.number().optional()
+});
 
 // src/adapters/event/fit-to-krd-event.converter.ts
 var convertFitToKrdEvent = (data) => {
@@ -803,6 +803,34 @@ var convertFitToKrdEvents = (events) => {
   return events.map(convertFitToKrdEvent);
 };
 
+// src/adapters/extensions/developer-fields.extractor.ts
+var extractDeveloperFields = (message) => {
+  const devFields = [];
+  for (const [key, value] of Object.entries(message)) {
+    if (key.startsWith("developer_") || key.includes("DeveloperField")) {
+      devFields.push({
+        fieldName: key,
+        value
+      });
+    }
+  }
+  return devFields;
+};
+var extractFieldsFromMessageArray = (messages) => {
+  const developerFields = [];
+  for (const message of messages) {
+    if (message && typeof message === "object") {
+      const devFields = extractDeveloperFields(
+        message
+      );
+      if (devFields.length > 0) {
+        developerFields.push(...devFields);
+      }
+    }
+  }
+  return developerFields;
+};
+
 // src/adapters/extensions/extensions.extractor.ts
 var extractFitExtensions = (messages, logger) => {
   logger.debug("Extracting FIT extensions");
@@ -829,30 +857,11 @@ var extractAllDeveloperFields = (messages) => {
   const developerFields = [];
   for (const value of Object.values(messages)) {
     if (value && Array.isArray(value)) {
-      for (const message of value) {
-        if (message && typeof message === "object") {
-          const devFields = extractDeveloperFields(message);
-          if (devFields.length > 0) {
-            developerFields.push(...devFields);
-          }
-        }
-      }
+      developerFields.push(...extractFieldsFromMessageArray(value));
     }
   }
   return developerFields;
 };
-var extractDeveloperFields = (message) => {
-  const devFields = [];
-  for (const [key, value] of Object.entries(message)) {
-    if (key.startsWith("developer_") || key.includes("DeveloperField")) {
-      devFields.push({
-        fieldName: key,
-        value
-      });
-    }
-  }
-  return devFields;
-};
 var buildExtensions = (unknownMessages, developerFields, logger) => {
   const extensions = {};
   if (developerFields.length > 0) {
@@ -950,7 +959,7 @@ var mapFitLapTriggerToKrd = (fit) => {
   }
 };
 
-// src/adapters/lap/lap.mapper.ts
+// src/adapters/lap/fit-to-krd-lap.mapper.ts
 var mapFitLapToKrd = (fit) => ({
   // Timing - convert ms to seconds
   startTime: new Date(fit.startTime * 1e3).toISOString(),
@@ -1016,17 +1025,17 @@ var fitRecordSchema = z.object({
   compressedTimestamp: z.number().optional()
 });
 
-// src/adapters/record/record.mapper.ts
-var mapFitRecordToKrd = (fit) => {
-  const record = {
-    timestamp: new Date(fit.timestamp * 1e3).toISOString()
-  };
+// src/adapters/record/record-from-fit.mapper.ts
+var mapFitPosition = (fit) => {
   if (fit.positionLat !== void 0 && fit.positionLong !== void 0) {
-    record.position = {
+    return {
       lat: semicirclesToDegrees(fit.positionLat),
       lon: semicirclesToDegrees(fit.positionLong)
     };
   }
+  return void 0;
+};
+var mapFitAltitudeAndSpeed = (fit, record) => {
   if (fit.enhancedAltitude !== void 0) {
     record.altitude = fit.enhancedAltitude;
   } else if (fit.altitude !== void 0) {
@@ -1037,6 +1046,8 @@ var mapFitRecordToKrd = (fit) => {
   } else if (fit.speed !== void 0) {
     record.speed = fit.speed;
   }
+};
+var mapFitCoreFields = (fit, record) => {
   if (fit.distance !== void 0) record.distance = fit.distance;
   if (fit.heartRate !== void 0) record.heartRate = fit.heartRate;
   if (fit.power !== void 0) record.power = fit.power;
@@ -1044,11 +1055,23 @@ var mapFitRecordToKrd = (fit) => {
   if (fit.cadence !== void 0) {
     record.cadence = fit.cadence + (fit.fractionalCadence ?? 0);
   }
+};
+var mapFitRunningDynamics = (fit, record) => {
   if (fit.verticalOscillation !== void 0) {
     record.verticalOscillation = fit.verticalOscillation;
   }
   if (fit.stanceTime !== void 0) record.stanceTime = fit.stanceTime;
   if (fit.stepLength !== void 0) record.stepLength = fit.stepLength;
+};
+var mapFitRecordToKrd = (fit) => {
+  const record = {
+    timestamp: new Date(fit.timestamp * 1e3).toISOString()
+  };
+  const position = mapFitPosition(fit);
+  if (position) record.position = position;
+  mapFitAltitudeAndSpeed(fit, record);
+  mapFitCoreFields(fit, record);
+  mapFitRunningDynamics(fit, record);
   return record;
 };
 
@@ -1136,6 +1159,13 @@ var convertTimeCreated = (timeCreated) => {
     return new Date(timeCreated * 1e3).toISOString();
   return (/* @__PURE__ */ new Date()).toISOString();
 };
+var buildKrdMetadata = (fileId, session) => ({
+  created: convertTimeCreated(fileId ? fileId.timeCreated : void 0),
+  sport: (session ? session.sport : void 0) ?? "other",
+  subSport: session ? session.subSport : void 0
+});
+var toOptionalArray = (items) => items.length > 0 ? items : void 0;
+var toOptionalSingle = (item) => item !== void 0 ? [item] : void 0;
 var mapActivityFileToKRD = (messages, logger) => {
   const fileId = messages[fitMessageKeySchema.enum.fileIdMesgs]?.[0];
   const sessionMsgs = messages[fitMessageKeySchema.enum.sessionMesgs] || [];
@@ -1153,22 +1183,18 @@ var mapActivityFileToKRD = (messages, logger) => {
   const events = convertFitToKrdEvents(eventMsgs);
   const laps = convertFitToKrdLaps(lapMsgs);
   const fitExtensions = extractFitExtensions(messages, logger);
-  const created = convertTimeCreated(fileId?.timeCreated);
   return {
     version: KRD_VERSION,
     type: fileTypeSchema.enum.recorded_activity,
-    metadata: {
-      created,
-      sport: session?.sport ?? "other",
-      subSport: session?.subSport
-    },
-    sessions: session ? [session] : void 0,
-    laps: laps.length > 0 ? laps : void 0,
-    records: records.length > 0 ? records : void 0,
-    events: events.length > 0 ? events : void 0,
-    extensions: {
-      fit: fitExtensions
-    }
+    metadata: buildKrdMetadata(
+      fileId,
+      session
+    ),
+    sessions: toOptionalSingle(session),
+    laps: toOptionalArray(laps),
+    records: toOptionalArray(records),
+    events: toOptionalArray(events),
+    extensions: { fit: fitExtensions }
   };
 };
 var DEFAULT_SPORT = sportSchema.enum.cycling;
@@ -1373,34 +1399,24 @@ var convertFitDuration = (data) => {
 var mapDuration = (step) => {
   return convertFitDuration(step);
 };
+var FIT_TO_KRD_DURATION_TYPE = {
+  [fitDurationTypeSchema.enum.time]: durationTypeSchema.enum.time,
+  [fitDurationTypeSchema.enum.distance]: durationTypeSchema.enum.distance,
+  [fitDurationTypeSchema.enum.hrLessThan]: durationTypeSchema.enum.heart_rate_less_than,
+  [fitDurationTypeSchema.enum.repeatUntilHrGreaterThan]: durationTypeSchema.enum.repeat_until_heart_rate_greater_than,
+  [fitDurationTypeSchema.enum.calories]: durationTypeSchema.enum.calories,
+  [fitDurationTypeSchema.enum.powerLessThan]: durationTypeSchema.enum.power_less_than,
+  [fitDurationTypeSchema.enum.powerGreaterThan]: durationTypeSchema.enum.power_greater_than,
+  [fitDurationTypeSchema.enum.repeatUntilTime]: durationTypeSchema.enum.repeat_until_time,
+  [fitDurationTypeSchema.enum.repeatUntilDistance]: durationTypeSchema.enum.repeat_until_distance,
+  [fitDurationTypeSchema.enum.repeatUntilCalories]: durationTypeSchema.enum.repeat_until_calories,
+  [fitDurationTypeSchema.enum.repeatUntilHrLessThan]: durationTypeSchema.enum.repeat_until_heart_rate_less_than,
+  [fitDurationTypeSchema.enum.repeatUntilPowerLessThan]: durationTypeSchema.enum.repeat_until_power_less_than,
+  [fitDurationTypeSchema.enum.repeatUntilPowerGreaterThan]: durationTypeSchema.enum.repeat_until_power_greater_than
+};
 var mapDurationType = (fitDurationType) => {
-  if (fitDurationType === fitDurationTypeSchema.enum.time)
-    return durationTypeSchema.enum.time;
-  if (fitDurationType === fitDurationTypeSchema.enum.distance)
-    return durationTypeSchema.enum.distance;
-  if (fitDurationType === fitDurationTypeSchema.enum.hrLessThan)
-    return durationTypeSchema.enum.heart_rate_less_than;
-  if (fitDurationType === fitDurationTypeSchema.enum.repeatUntilHrGreaterThan)
-    return durationTypeSchema.enum.repeat_until_heart_rate_greater_than;
-  if (fitDurationType === fitDurationTypeSchema.enum.calories)
-    return durationTypeSchema.enum.calories;
-  if (fitDurationType === fitDurationTypeSchema.enum.powerLessThan)
-    return durationTypeSchema.enum.power_less_than;
-  if (fitDurationType === fitDurationTypeSchema.enum.powerGreaterThan)
-    return durationTypeSchema.enum.power_greater_than;
-  if (fitDurationType === fitDurationTypeSchema.enum.repeatUntilTime)
-    return durationTypeSchema.enum.repeat_until_time;
-  if (fitDurationType === fitDurationTypeSchema.enum.repeatUntilDistance)
-    return durationTypeSchema.enum.repeat_until_distance;
-  if (fitDurationType === fitDurationTypeSchema.enum.repeatUntilCalories)
-    return durationTypeSchema.enum.repeat_until_calories;
-  if (fitDurationType === fitDurationTypeSchema.enum.repeatUntilHrLessThan)
-    return durationTypeSchema.enum.repeat_until_heart_rate_less_than;
-  if (fitDurationType === fitDurationTypeSchema.enum.repeatUntilPowerLessThan)
-    return durationTypeSchema.enum.repeat_until_power_less_than;
-  if (fitDurationType === fitDurationTypeSchema.enum.repeatUntilPowerGreaterThan)
-    return durationTypeSchema.enum.repeat_until_power_greater_than;
-  return durationTypeSchema.enum.open;
+  if (!fitDurationType) return durationTypeSchema.enum.open;
+  return FIT_TO_KRD_DURATION_TYPE[fitDurationType] ?? durationTypeSchema.enum.open;
 };
 var convertCadenceTarget2 = (data) => {
   const rangeTarget = buildCadenceRangeTarget(data);
@@ -1830,22 +1846,24 @@ var mapWorkout = (workoutMsg, workoutSteps, logger) => {
   }
   return workout;
 };
-var validateMessages = (fileId, workoutMsg, messages, logger, options = {}) => {
-  const { strict = true } = options;
+var checkFileId = (fileId, logger, strict) => {
   if (!fileId) {
     const message = "Missing required fileId message in FIT file";
-    if (strict) {
-      throw createFitParsingError(message);
-    }
+    if (strict) throw createFitParsingError(message);
     logger.warn(message);
   }
+};
+var checkWorkoutMsg = (workoutMsg, logger, strict) => {
   if (!workoutMsg) {
     const message = "Missing required workout message in FIT file";
-    if (strict) {
-      throw createFitParsingError(message);
-    }
+    if (strict) throw createFitParsingError(message);
     logger.warn(message);
   }
+};
+var validateMessages = (...[fileId, workoutMsg, messages, logger, options = {}]) => {
+  const { strict = true } = options;
+  checkFileId(fileId, logger, strict);
+  checkWorkoutMsg(workoutMsg, logger, strict);
   const workoutMessages = messages[fitMessageKeySchema.enum.workoutMesgs];
   if (workoutMessages && workoutMessages.length > 1) {
     logger.warn("Multiple workout messages found, using first one", {