fit-file-parser 4.1.0 → 5.0.2

package/dist/helper.js

@@ -1,18 +1,27 @@
+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;
+}
 export 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;
@@ -21,6 +30,7 @@ export function mapDataIntoLap(inputLaps, lapKey, data) {
             }
             else {
                 tempData.push(row);
+                index = j + 1;
             }
         }
         if (!laps[i][lapKey]) {
@@ -35,15 +45,14 @@ export 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;
@@ -52,6 +61,7 @@ export function mapDataIntoSession(inputSessions, laps) {
             }
             else {
                 tempLaps.push(lap);
+                lapIndex = j + 1;
             }
         }
         if (!sessions[i].laps) {

package/dist/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/type_generator.js

@@ -38,9 +38,15 @@ export function generateProperty(name, type, optional = true) {
 export function generateArrayProperty(name, type, optional = true) {
     return generateProperty(name, ts.factory.createArrayTypeNode(type), optional);
 }
+function generateNullableArrayType(type) {
+    return ts.factory.createArrayTypeNode(ts.factory.createParenthesizedType(ts.factory.createUnionTypeNode([
+        type,
+        ts.factory.createLiteralTypeNode(ts.factory.createNull()),
+    ])));
+}
 export function generateTypeFromField(def) {
     if (def.array === true) {
-        return ts.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':
@@ -50,14 +56,15 @@ export function generateTypeFromField(def) {
         case 'sint16_array':
         case 'sint8_array':
         case 'byte_array':
-            return ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword));
+            return generateNullableArrayType(ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword));
         case 'exercise_category_array':
-            return ts.factory.createArrayTypeNode(ts.factory.createTypeReferenceNode('ExerciseCategory'));
-        case 'bool':
-            return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+            return generateNullableArrayType(ts.factory.createTypeReferenceNode('ExerciseCategory'));
         case 'date_time':
+        case 'local_date_time':
+            return ts.factory.createTypeReferenceNode('Date');
         case 'string':
             return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+        case 'bool':
         case 'uint32':
         case 'uint64':
         case 'uint16':
@@ -87,20 +94,30 @@ export 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
+            ? ts.factory.createTypeLiteralNode([
+                generateProperty('value', ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword), false),
+                ...names
+                    .filter(value => value !== 'mask')
+                    .map(value => generateProperty(String(value), ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword), false)),
+            ])
+            : names.length === 0
+                ? ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword)
+                : ts.factory.createUnionTypeNode([
+                    ...names.map(n => ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(String(n)))),
+                    ...(name === 'mesg_num'
+                        ? [
+                            ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral('definition')),
+                        ]
+                        : []),
+                    ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
+                ]);
         const typeAlias = ts.factory.createTypeAliasDeclaration([
             ts.factory.createModifier(ts.SyntaxKind.ExportKeyword),
-        ], snakeToCamel(name), undefined, names.length === 0
-            ? ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword)
-            : ts.factory.createUnionTypeNode([...names.map(n => ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(String(n)))), ...(name === 'mesg_num'
-                    ? [
-                        ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral('definition')),
-                    ]
-                    : [])]));
+        ], snakeToCamel(name), undefined, typeNode);
         nodes.push(typeAlias);
     });
     return nodes;
@@ -137,13 +154,6 @@ export function generateUtilities() {
         ]),
     ]));
     nodes.push(unitType);
-    const messageIndex = ts.factory.createInterfaceDeclaration([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], 'MessageIndex', undefined, undefined, [
-        generateProperty('0', ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword), false),
-        generateProperty('value', ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword), false),
-        generateProperty('reserved', ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword), false),
-        generateProperty('selected', ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword), false),
-    ]);
-    nodes.push(messageIndex);
     return nodes;
 }
 function generateAdditionalFields(msg) {
@@ -241,22 +251,13 @@ export function generateMessages(messages) {
     const nodes = [];
     Object.keys(messages).forEach((name) => {
         const msg = FIT.messages[Number(name)];
-        const usedFields = new Set();
         const messageType = ts.factory.createInterfaceDeclaration([
             ts.factory.createModifier(ts.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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fit-file-parser",
   "type": "module",
-  "version": "4.1.0",
+  "version": "5.0.2",
   "private": false,
   "description": "Parse your .FIT files easily, directly from JS (Garmin, Polar, Suunto)",
   "author": {