fit-file-parser 4.1.0 → 5.0.2

package/dist/cjs/helper.js

@@ -2,21 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapDataIntoLap = mapDataIntoLap;
 exports.mapDataIntoSession = mapDataIntoSession;
+function timestampValue(value) {
+    if (value === undefined || value === null) {
+        return undefined;
+    }
+    const timestamp = value instanceof Date
+        ? value.getTime()
+        : new Date(value).getTime();
+    return Number.isFinite(timestamp) ? timestamp : undefined;
+}
 function mapDataIntoLap(inputLaps, lapKey, data) {
+    var _a;
     const laps = [...inputLaps];
     let index = 0;
     for (let i = 0; i < laps.length; i++) {
         const nextLap = laps[i + 1];
         const tempData = [];
-        const nextLapStartTime = nextLap
-            ? new Date(nextLap.start_time).getTime()
-            : null;
+        const nextLapStartTime = timestampValue(nextLap === null || nextLap === void 0 ? void 0 : nextLap.start_time);
         for (let j = index; j < data.length; j++) {
             const row = data[j];
-            if (nextLap && nextLapStartTime) {
-                const timestamp = new Date(row.timestamp || row.start_time).getTime();
-                if (nextLapStartTime > timestamp) {
+            if (nextLap && nextLapStartTime !== undefined) {
+                const timestamp = timestampValue((_a = row.timestamp) !== null && _a !== void 0 ? _a : row.start_time);
+                if (timestamp === undefined || nextLapStartTime > timestamp) {
                     tempData.push(row);
+                    index = j + 1;
                 }
                 else if (nextLapStartTime <= timestamp) {
                     index = j;
@@ -25,6 +34,7 @@ function mapDataIntoLap(inputLaps, lapKey, data) {
             }
             else {
                 tempData.push(row);
+                index = j + 1;
             }
         }
         if (!laps[i][lapKey]) {
@@ -39,15 +49,14 @@ function mapDataIntoSession(inputSessions, laps) {
     for (let i = 0; i < sessions.length; i++) {
         const nextSession = sessions[i + 1];
         const tempLaps = [];
-        const nextSessionStartTime = nextSession
-            ? new Date(nextSession.start_time).getTime()
-            : null;
+        const nextSessionStartTime = timestampValue(nextSession === null || nextSession === void 0 ? void 0 : nextSession.start_time);
         for (let j = lapIndex; j < laps.length; j++) {
             const lap = laps[j];
-            if (nextSession && nextSessionStartTime) {
-                const lapStartTime = new Date(lap.start_time).getTime();
-                if (nextSessionStartTime > lapStartTime) {
+            if (nextSession && nextSessionStartTime !== undefined) {
+                const lapStartTime = timestampValue(lap.start_time);
+                if (lapStartTime === undefined || nextSessionStartTime > lapStartTime) {
                     tempLaps.push(lap);
+                    lapIndex = j + 1;
                 }
                 else if (nextSessionStartTime <= lapStartTime) {
                     lapIndex = j;
@@ -56,6 +65,7 @@ function mapDataIntoSession(inputSessions, laps) {
             }
             else {
                 tempLaps.push(lap);
+                lapIndex = j + 1;
             }
         }
         if (!sessions[i].laps) {

package/dist/cjs/messages.d.ts

@@ -1,7 +1,6 @@
-import type { MessageObject } from './fit.js';
-import type { MesgNum } from './fit_types.js';
+import type { MessageName, MessageObject } from './fit.js';
 export declare function getFitMessage(messageNum: number): {
-    name: MesgNum | '';
+    name: MessageName | '';
     getAttributes: (fieldNum: number) => MessageObject;
 };
 export declare function getFitMessageBaseType(inp: any): any;

package/dist/cjs/type_generator.js

@@ -59,9 +59,15 @@ function generateProperty(name, type, optional = true) {
 function generateArrayProperty(name, type, optional = true) {
     return generateProperty(name, typescript_1.default.factory.createArrayTypeNode(type), optional);
 }
+function generateNullableArrayType(type) {
+    return typescript_1.default.factory.createArrayTypeNode(typescript_1.default.factory.createParenthesizedType(typescript_1.default.factory.createUnionTypeNode([
+        type,
+        typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createNull()),
+    ])));
+}
 function generateTypeFromField(def) {
     if (def.array === true) {
-        return typescript_1.default.factory.createArrayTypeNode(generateTypeFromField(Object.assign(Object.assign({}, def), { array: false })));
+        return generateNullableArrayType(generateTypeFromField(Object.assign(Object.assign({}, def), { array: false })));
     }
     switch (def.type) {
         case 'uint32_array':
@@ -71,14 +77,15 @@ function generateTypeFromField(def) {
         case 'sint16_array':
         case 'sint8_array':
         case 'byte_array':
-            return typescript_1.default.factory.createArrayTypeNode(typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword));
+            return generateNullableArrayType(typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword));
         case 'exercise_category_array':
-            return typescript_1.default.factory.createArrayTypeNode(typescript_1.default.factory.createTypeReferenceNode('ExerciseCategory'));
-        case 'bool':
-            return typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.BooleanKeyword);
+            return generateNullableArrayType(typescript_1.default.factory.createTypeReferenceNode('ExerciseCategory'));
         case 'date_time':
+        case 'local_date_time':
+            return typescript_1.default.factory.createTypeReferenceNode('Date');
         case 'string':
             return typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.StringKeyword);
+        case 'bool':
         case 'uint32':
         case 'uint64':
         case 'uint16':
@@ -108,20 +115,30 @@ function generateTypes(types) {
     const nodes = [];
     const typeNames = Object.keys(types);
     typeNames.forEach((name) => {
-        if (name === 'message_index') {
-            return;
-        }
         const type = types[name];
-        const names = Object.values(type);
+        const names = [...new Set(Object.values(type))];
+        const isMask = names.includes('mask');
+        const typeNode = isMask
+            ? typescript_1.default.factory.createTypeLiteralNode([
+                generateProperty('value', typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword), false),
+                ...names
+                    .filter(value => value !== 'mask')
+                    .map(value => generateProperty(String(value), typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.BooleanKeyword), false)),
+            ])
+            : names.length === 0
+                ? typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword)
+                : typescript_1.default.factory.createUnionTypeNode([
+                    ...names.map(n => typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createStringLiteral(String(n)))),
+                    ...(name === 'mesg_num'
+                        ? [
+                            typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createStringLiteral('definition')),
+                        ]
+                        : []),
+                    typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword),
+                ]);
         const typeAlias = typescript_1.default.factory.createTypeAliasDeclaration([
             typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword),
-        ], snakeToCamel(name), undefined, names.length === 0
-            ? typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword)
-            : typescript_1.default.factory.createUnionTypeNode([...names.map(n => typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createStringLiteral(String(n)))), ...(name === 'mesg_num'
-                    ? [
-                        typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createStringLiteral('definition')),
-                    ]
-                    : [])]));
+        ], snakeToCamel(name), undefined, typeNode);
         nodes.push(typeAlias);
     });
     return nodes;
@@ -158,13 +175,6 @@ function generateUtilities() {
         ]),
     ]));
     nodes.push(unitType);
-    const messageIndex = typescript_1.default.factory.createInterfaceDeclaration([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], 'MessageIndex', undefined, undefined, [
-        generateProperty('0', typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.BooleanKeyword), false),
-        generateProperty('value', typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword), false),
-        generateProperty('reserved', typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.BooleanKeyword), false),
-        generateProperty('selected', typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.BooleanKeyword), false),
-    ]);
-    nodes.push(messageIndex);
     return nodes;
 }
 function generateAdditionalFields(msg) {
@@ -262,22 +272,13 @@ function generateMessages(messages) {
     const nodes = [];
     Object.keys(messages).forEach((name) => {
         const msg = fit_js_1.FIT.messages[Number(name)];
-        const usedFields = new Set();
         const messageType = typescript_1.default.factory.createInterfaceDeclaration([
             typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword),
         ], snakeToCamel(`parsed_${msg.name}`), undefined, undefined, [
-            ...Object.keys(msg).filter(n => n !== 'name').reduce((acc, id) => {
-                var _a;
+            ...Object.keys(msg).filter(n => n !== 'name').map((id) => {
                 const def = msg[Number(id)];
-                const definitions = [def, ...((_a = def.aliases) !== null && _a !== void 0 ? _a : [])];
-                definitions.forEach((definition) => {
-                    if (!usedFields.has(definition.field)) {
-                        usedFields.add(definition.field);
-                        acc.push(generateProperty(definition.field, generateTypeFromField(definition), !['start_time', 'timestamp'].includes(definition.field)));
-                    }
-                });
-                return acc;
-            }, []),
+                return generateProperty(def.field, generateTypeFromField(def));
+            }),
             ...generateAdditionalFields(msg),
         ]);
         nodes.push(messageType);

package/dist/fit-parser.js

@@ -163,8 +163,10 @@ export default class FitParser {
                 case 'record':
                     if (!startDate) {
                         startDate = message.timestamp;
-                        message.elapsed_time = 0;
-                        message.timer_time = 0;
+                        if (this.options.elapsedRecordField) {
+                            message.elapsed_time = 0;
+                            message.timer_time = 0;
+                        }
                     }
                     records.push(message);
                     break;

package/dist/fit.d.ts

@@ -1,4 +1,5 @@
 import type { FitOptions, MesgNum } from './fit_types.js';
+export type MessageName = Exclude<MesgNum, number | 'definition'>;
 export interface FieldDefinition {
     type: string | number;
     rawType?: string | number;
@@ -12,10 +13,10 @@ export interface FieldDefinition {
     dataType: string;
     scale?: number | null;
     offset?: number;
+    units?: string;
     requiresBoundedDataView?: boolean;
     developerDataIndex?: number;
     isDeveloperField?: boolean;
-    aliases?: MessageObject[];
 }
 export interface MessageObject {
     field: string;
@@ -25,20 +26,21 @@ export interface MessageObject {
     scale: number | null;
     offset: number;
     units: string;
-    aliases?: MessageObject[];
 }
 export interface Message {
-    name: MesgNum;
+    name: MessageName;
     [fieldId: number]: MessageObject;
 }
 export interface FitType {
     scConst: number;
     options: FitOptions;
-    messages: {
-        [messageId: number]: Message;
-    };
-    types: {
-        [typeName: string]: Record<number, string | number>;
-    };
+    messages: Record<number, Message>;
+    types: Record<string, Record<number, string | number>>;
 }
+/**
+ * Garmin fields observed in the external FIT corpus but absent from the pinned
+ * public SDK profile. These additions may not replace standard SDK fields.
+ */
+export declare const FIT_VENDOR_MESSAGE_EXTENSIONS: Record<number, Message>;
+export declare const FIT_VENDOR_TYPE_EXTENSIONS: Record<string, Record<number, string>>;
 export declare const FIT: FitType;