@sports-alliance/sports-lib 7.0.0 → 7.0.3

package/.github/workflows/test.yml

@@ -2,9 +2,9 @@ name: Test
 
 on:
   push:
-    branches: [ "master", "develop" ]
+    branches: [ "master" ]
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches: [ "master", "develop" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

package/lib/cjs/activities/activity.types.d.ts

@@ -141,9 +141,12 @@ export declare enum ActivityTypes {
     'MountainBiking' = "Mountain Biking",
     'Mountain Biking' = "Mountain Biking",
     'cycling_cyclocross' = "Mountain Biking",
-    'mountain' = "Mountain Biking",
+    'mountain' = "Mountain Biking",// @todo this feels hacky but exists and indeed it's MTB
     'Mountain biking' = "Mountain Biking",
+    'cycling_mountain_enduro' = "Enduro MTB",
+    'Enduro MTB' = "Enduro MTB",
     'cycling_downhill' = "Downhill Cycling",
+    'cycling_mountain_downhill' = "Downhill Cycling",
     'DownhillCycling' = "Downhill Cycling",
     'Downhill Cycling' = "Downhill Cycling",
     /**
@@ -317,8 +320,8 @@ export declare enum ActivityTypes {
     'BackCountrySkiing' = "Backcountry Skiing",
     'BackcountrySkiing' = "Backcountry Skiing",
     'BackcountrySki' = "Backcountry Skiing",
-    'cross_country_skiing_backcountry' = "Backcountry Skiing",
-    'alpine_skiing_backcountry' = "Backcountry Skiing",
+    'cross_country_skiing_backcountry' = "Backcountry Skiing",// Hack for suunto
+    'alpine_skiing_backcountry' = "Backcountry Skiing",// Hack for suunto
     'backcountry' = "Backcountry Skiing",
     'BackCountrySki' = "Backcountry Skiing",
     /**

package/lib/cjs/activities/activity.types.js

@@ -234,7 +234,12 @@ var ActivityTypes;
     ActivityTypes["cycling_cyclocross"] = "Mountain Biking";
     ActivityTypes["mountain"] = "Mountain Biking";
     ActivityTypes["Mountain biking"] = "Mountain Biking";
+    // Enduro
+    ActivityTypes["cycling_mountain_enduro"] = "Enduro MTB";
+    ActivityTypes["Enduro MTB"] = "Enduro MTB";
+    // Downhill
     ActivityTypes["cycling_downhill"] = "Downhill Cycling";
+    ActivityTypes["cycling_mountain_downhill"] = "Downhill Cycling";
     ActivityTypes["DownhillCycling"] = "Downhill Cycling";
     ActivityTypes["Downhill Cycling"] = "Downhill Cycling";
     /**
@@ -876,7 +881,7 @@ var ActivityTypes;
     ActivityTypes["Workout"] = "Workout";
     ActivityTypes["generic_match"] = "Match";
     ActivityTypes["Match"] = "Match";
-})(ActivityTypes = exports.ActivityTypes || (exports.ActivityTypes = {}));
+})(ActivityTypes || (exports.ActivityTypes = ActivityTypes = {}));
 var ActivityTypeGroups;
 (function (ActivityTypeGroups) {
     ActivityTypeGroups["Running"] = "Running";
@@ -897,7 +902,7 @@ var ActivityTypeGroups;
     ActivityTypeGroups["Team Racket"] = "Team Racket";
     ActivityTypeGroups["TeamRacket"] = "Team Racket";
     ActivityTypeGroups["Unspecified"] = "Unspecified";
-})(ActivityTypeGroups = exports.ActivityTypeGroups || (exports.ActivityTypeGroups = {}));
+})(ActivityTypeGroups || (exports.ActivityTypeGroups = ActivityTypeGroups = {}));
 class ActivityTypesGroupMapping {
 }
 exports.ActivityTypesGroupMapping = ActivityTypesGroupMapping;
@@ -1021,8 +1026,8 @@ exports.ActivityTypesMoving = ActivityTypesMoving;
  * Holds moving speed threshold in m/s per sport group
  */
 ActivityTypesMoving.SPORTS_MOVING_SPEED_THRESHOLD_MAP = new Map([
-    [ActivityTypeGroups.Running, 1.5 / 3.6],
-    [ActivityTypeGroups.Cycling, 4 / 3.6],
+    [ActivityTypeGroups.Running, 1.5 / 3.6], // kph to m/s
+    [ActivityTypeGroups.Cycling, 4 / 3.6], // kph to m/s
     [ActivityTypeGroups.Swimming, 0.3] // 30 cm/s
 ]);
 ActivityTypesMoving.DEFAULT_MOVING_SPEED_THRESHOLD = 0.3; // m/s

package/lib/cjs/activities/devices/device.d.ts

@@ -5,6 +5,7 @@ export declare class Device implements DeviceInterface {
     name?: string;
     index?: number;
     batteryStatus?: string;
+    batteryLevel?: number;
     batteryVoltage?: number;
     manufacturer?: string;
     serialNumber?: string;

package/lib/cjs/activities/devices/device.interface.d.ts

@@ -4,6 +4,7 @@ export interface DeviceInterface extends SerializableClassInterface {
     name?: string;
     index?: number;
     batteryStatus?: string;
+    batteryLevel?: number;
     batteryVoltage?: number;
     manufacturer?: string;
     serialNumber?: string;

package/lib/cjs/activities/devices/device.js

@@ -11,6 +11,7 @@ class Device {
             type: this.type,
             index: (0, helpers_1.isNumber)(this.index) ? this.index || null : null,
             batteryStatus: this.batteryStatus || null,
+            batteryLevel: this.batteryLevel || null,
             name: this.name || null,
             batteryVoltage: this.batteryVoltage || null,
             manufacturer: this.manufacturer || null,

package/lib/cjs/activities/devices/device.json.interface.d.ts

@@ -3,6 +3,7 @@ export interface DeviceJsonInterface {
     name: string | null;
     index: number | null;
     batteryStatus: string | null;
+    batteryLevel: number | null;
     batteryVoltage: number | null;
     manufacturer: string | null;
     serialNumber: string | null;

package/lib/cjs/data/data.cycling-position.js

@@ -11,7 +11,7 @@ var RiderPosition;
     RiderPosition[RiderPosition["STANDING"] = 1] = "STANDING";
     RiderPosition[RiderPosition["TRANSITION_TO_SEATED"] = 2] = "TRANSITION_TO_SEATED";
     RiderPosition[RiderPosition["TRANSITION_TO_STANDING"] = 3] = "TRANSITION_TO_STANDING";
-})(RiderPosition = exports.RiderPosition || (exports.RiderPosition = {}));
+})(RiderPosition || (exports.RiderPosition = RiderPosition = {}));
 class DataCyclingPosition extends data_cycling_dynamics_1.DataCyclingDynamics {
 }
 exports.DataCyclingPosition = DataCyclingPosition;

package/lib/cjs/data/data.feeling.js

@@ -16,4 +16,4 @@ var Feelings;
     Feelings[Feelings["Good"] = 3] = "Good";
     Feelings[Feelings["Very Good"] = 4] = "Very Good";
     Feelings[Feelings["Excellent"] = 5] = "Excellent";
-})(Feelings = exports.Feelings || (exports.Feelings = {}));
+})(Feelings || (exports.Feelings = Feelings = {}));

package/lib/cjs/data/data.interface.js

@@ -5,4 +5,4 @@ var UnitSystem;
 (function (UnitSystem) {
     UnitSystem[UnitSystem["Metric"] = 0] = "Metric";
     UnitSystem[UnitSystem["Imperial"] = 1] = "Imperial";
-})(UnitSystem = exports.UnitSystem || (exports.UnitSystem = {}));
+})(UnitSystem || (exports.UnitSystem = UnitSystem = {}));

package/lib/cjs/data/data.rpe.js

@@ -24,4 +24,4 @@ var RPEBorgCR10SCale;
     RPEBorgCR10SCale[RPEBorgCR10SCale["Very severe"] = 8] = "Very severe";
     RPEBorgCR10SCale[RPEBorgCR10SCale["Extreme"] = 9] = "Extreme";
     RPEBorgCR10SCale[RPEBorgCR10SCale["Maximal"] = 10] = "Maximal";
-})(RPEBorgCR10SCale = exports.RPEBorgCR10SCale || (exports.RPEBorgCR10SCale = {}));
+})(RPEBorgCR10SCale || (exports.RPEBorgCR10SCale = RPEBorgCR10SCale = {}));

package/lib/cjs/data/data.store.export.spec.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -34,12 +48,12 @@ describe('DataStore Export Verification', () => {
         'data.json.interface.ts',
         'data.position.interface.ts',
         'data.spec.ts',
-        'data.ts',
-        'data.string.ts',
-        'data.number.ts',
-        'data.boolean.ts',
-        'data.percent.ts',
-        'data.array.ts',
+        'data.ts', // Base class
+        'data.string.ts', // Base class
+        'data.number.ts', // Base class
+        'data.boolean.ts', // Base class
+        'data.percent.ts', // Base class or abstract?
+        'data.array.ts', // Base class
         'data.balance.ts' // interface/base
     ];
     files.forEach(file => {

package/lib/cjs/data/data.store.js

@@ -363,7 +363,7 @@ exports.DataStore = {
     DataVerticalSpeedMinMilesPerHour: data_vertical_speed_min_1.DataVerticalSpeedMinMilesPerHour,
     DataIBI: data_ibi_1.DataIBI,
     DataSteps: data_steps_1.DataSteps,
-    DataStepsOld: data_steps_old_1.DataStepsOld,
+    DataStepsOld: data_steps_old_1.DataStepsOld, // @todo find way to make this easy to migrate for projects that persist data based on types
     DataStrydAltitude: // @todo find way to make this easy to migrate for projects that persist data based on types
     data_stryd_altitude_1.DataStrydAltitude,
     DataStrydSpeed: data_stryd_speed_1.DataStrydSpeed,

package/lib/cjs/events/adapters/file-type.enum.js

@@ -7,4 +7,4 @@ var FileType;
     FileType["TCX"] = "tcx";
     FileType["FIT"] = "fit";
     FileType["SUUNTO"] = "suunto";
-})(FileType = exports.FileType || (exports.FileType = {}));
+})(FileType || (exports.FileType = FileType = {}));

package/lib/cjs/events/adapters/importers/fit/importer.fit.coros.device.names.js

@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImporterFitCorosDeviceNames = void 0;
 exports.ImporterFitCorosDeviceNames = {
     802: 'PACE 2',
-    841: 'APEX Pro'
+    841: 'APEX Pro',
+    821: 'APEX'
 };

package/lib/cjs/events/adapters/importers/fit/importer.fit.d.ts

@@ -1,8 +1,9 @@
 import { EventInterface } from '../../../event.interface';
 import { CreatorInterface } from '../../../../creators/creator.interface';
 import { ActivityParsingOptions } from '../../../../activities/activity-parsing-options';
+import { Buffer } from 'buffer';
 export declare class EventImporterFIT {
-    static getFromArrayBuffer(arrayBuffer: ArrayBuffer, options?: ActivityParsingOptions, name?: string): Promise<EventInterface>;
+    static getFromArrayBuffer(arrayBuffer: ArrayBuffer | Buffer<ArrayBuffer>, options?: ActivityParsingOptions, name?: string): Promise<EventInterface>;
     /**
      * Tell if an activity is lengths based (e.g. Pool swimming activities)
      * @param sessionObject

package/lib/cjs/events/adapters/importers/fit/importer.fit.garmin.device.names.js

@@ -119,6 +119,7 @@ exports.ImporterFitGarminDeviceNames = {
     1328: 'Forerunner 910XT',
     1333: 'Edge 800',
     1334: 'Edge 800',
+    1341: 'Alf 04',
     1345: 'Forerunner 610',
     1360: 'Forerunner 210',
     1386: 'Edge 800',
@@ -210,7 +211,7 @@ exports.ImporterFitGarminDeviceNames = {
     2290: 'Edge 20',
     2292: 'Approach X40',
     2293: 'Fenix 3',
-    2294: 'VivoSmart',
+    2294: 'VivoSmart EM',
     2310: 'Forerunner 630',
     2311: 'Forerunner 630',
     2313: 'Forerunner 230',
@@ -272,6 +273,7 @@ exports.ImporterFitGarminDeviceNames = {
     2769: 'Foretrex 601 701',
     2772: 'VivoMove HR',
     2713: 'Edge 1030',
+    2727: 'Forerunner 35',
     2796: 'Fenix 5',
     2797: 'Fenix 5S',
     2798: 'Fenix 5X',
@@ -314,9 +316,11 @@ exports.ImporterFitGarminDeviceNames = {
     3134: 'Fenix 5S Plus',
     3135: 'Fenix 5X Plus',
     3142: 'Edge 520 Plus',
+    3143: 'Descent T1',
     3144: 'Forerunner 235L',
     3145: 'Forerunner 245',
     3163: 'VivoActive 3M',
+    3192: 'Speed Sensor 2 ',
     3218: 'VivoSmart 4',
     3224: 'VivoActive 4',
     3225: 'VivoActive 4',
@@ -365,12 +369,13 @@ exports.ImporterFitGarminDeviceNames = {
     3558: 'Edge 130 Plus',
     3570: 'Edge 1030 Plus',
     3589: 'Forerunner 745',
+    3596: 'Venu SQ',
     3600: 'Venu SQ',
     3615: 'Lily',
     3624: 'Marq Adventurer',
     3638: 'Enduro',
-    3648: 'Marq Adventurer',
     3639: 'Swim 2',
+    3648: 'Marq Adventurer',
     3652: 'Forerunner 945',
     3703: 'Venu 2',
     3704: 'Venu 2S',
@@ -384,19 +389,73 @@ exports.ImporterFitGarminDeviceNames = {
     3823: 'Approach S12',
     3872: 'Enduro',
     3837: 'Venu SQ',
+    3843: 'Edge 1040',
     3850: 'Marq Golfer',
+    3851: 'Venu 2 Plus',
+    3865: 'Gnss',
     3869: 'Forerunner 55',
+    3888: 'Instinct 2',
+    3905: 'Fenix 7S',
+    3906: 'Fenix 7',
+    3907: 'Fenix 7X',
+    3908: 'Fenix 7S',
+    3909: 'Fenix 7',
+    3910: 'Fenix 7X',
     3930: 'Descent MK 2S',
     3934: 'Approach S42',
+    3943: 'Epix Gen 2',
+    3944: 'Epix Gen 2',
     3949: 'Venu 2S',
     3950: 'Venu 2',
     3978: 'Forerunner 945',
     3986: 'Approach S12',
+    3990: 'Forerunner 255 Music',
+    3991: 'Forerunner 255 Music',
+    3992: 'Forerunner 255',
+    3993: 'Forerunner 255',
     4002: 'Approach S42',
+    4005: 'Descent G1',
+    4017: 'Venu 2 Plus',
+    4024: 'Forerunner 955',
     4033: 'Forerunner 55',
+    4061: 'Edge 540',
+    4062: 'Edge 840',
+    4063: 'Vivosmart 5',
+    4071: 'Instinct 2',
+    4115: 'Venu SQ 2',
+    4116: 'Venu SQ 2MUSIC',
+    4124: 'Marq Gen 2 Aviator',
+    4125: 'D2 Air X10',
+    4132: 'Descent G1',
+    4135: 'Tactix 7',
+    4155: 'Instinct Crossover',
+    4169: 'Edge Explore 2',
+    4222: 'Descent MK 3',
+    4223: 'Descent MK 3I',
+    4233: 'Approach S70',
+    4257: 'Forerunner 265',
+    4258: 'Forerunner 265',
+    4260: 'Venu 3',
+    4261: 'Venu 3S',
+    4305: 'Edge 1040',
+    4312: 'Epix Gen 2 Pro 42',
+    4313: 'Epix Gen 2 Pro 47',
+    4314: 'Epix Gen 2 Pro 51',
+    4315: 'Forerunner 965',
+    4341: 'Enduro 2',
+    4374: 'Fenix 7S Pro Solar',
+    4375: 'Fenix 7 Pro Solar',
+    4376: 'Fenix 7X Pro Solar',
+    4380: 'Lily 2',
+    4394: 'Instinct 2X',
+    4426: 'VivoActive 5',
+    4442: 'Descent T2',
+    4472: 'Marq Gen 2 Commander',
+    4556: 'D2 H1 Pro',
     10014: 'Edge Remote',
     20533: 'Tacx Training App',
     20534: 'Tacx Training App',
+    20565: 'Tacx Training App Catalyst',
     20119: 'Training Center',
     30045: 'Tacx Training App',
     30046: 'Tacx Training App',