@sports-alliance/sports-lib 7.2.3 → 7.2.4

package/lib/cjs/data/data.event.d.ts

@@ -1,3 +1,4 @@
 import { DataNumber } from './data.number';
 export declare abstract class DataEvent extends DataNumber {
+    get timestamp(): number;
 }

package/lib/cjs/data/data.event.js

@@ -3,5 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataEvent = void 0;
 const data_number_1 = require("./data.number");
 class DataEvent extends data_number_1.DataNumber {
+    get timestamp() {
+        return this.getValue();
+    }
 }
 exports.DataEvent = DataEvent;

package/lib/cjs/data/data.jump-event.d.ts

@@ -1,17 +1,33 @@
 import { DataEvent } from './data.event';
+import { DataDistance } from './data.distance';
+import { DataSpeed } from './data.speed';
+import { DataDuration } from './data.duration';
+import { DataNumber } from './data.number';
+import { DataLatitudeDegrees } from './data.latitude-degrees';
+import { DataLongitudeDegrees } from './data.longitude-degrees';
+export declare class DataScore extends DataNumber {
+    static type: string;
+}
+export declare class DataRotations extends DataNumber {
+    static type: string;
+}
 export interface JumpEventInterface {
-    distance: number;
-    height?: number;
-    score: number;
-    hang_time?: number;
-    position_lat?: number;
-    position_long?: number;
-    speed?: number;
-    rotations?: number;
+    distance: DataDistance;
+    height?: DataDistance;
+    score: DataScore;
+    hang_time?: DataDuration;
+    position_lat?: DataLatitudeDegrees;
+    position_long?: DataLongitudeDegrees;
+    speed?: DataSpeed;
+    rotations?: DataRotations;
 }
 export declare class DataJumpEvent extends DataEvent {
-    jumpData: JumpEventInterface;
     static type: string;
-    constructor(timestamp: number, jumpData: JumpEventInterface);
+    jumpData: JumpEventInterface;
+    constructor(timestampOrObj: number | {
+        timestamp: number;
+        jumpData: any;
+    }, jumpData?: any);
+    private hydrate;
     toJSON(): any;
 }

package/lib/cjs/data/data.jump-event.js

@@ -1,15 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataJumpEvent = void 0;
+exports.DataJumpEvent = exports.DataRotations = exports.DataScore = void 0;
 const data_event_1 = require("./data.event");
+const data_distance_1 = require("./data.distance");
+const data_speed_1 = require("./data.speed");
+const data_duration_1 = require("./data.duration");
+const data_number_1 = require("./data.number");
+const data_latitude_degrees_1 = require("./data.latitude-degrees");
+const data_longitude_degrees_1 = require("./data.longitude-degrees");
+class DataScore extends data_number_1.DataNumber {
+}
+exports.DataScore = DataScore;
+DataScore.type = 'Score';
+class DataRotations extends data_number_1.DataNumber {
+}
+exports.DataRotations = DataRotations;
+DataRotations.type = 'Rotations';
 class DataJumpEvent extends data_event_1.DataEvent {
-    constructor(timestamp, jumpData) {
-        super(timestamp);
-        this.jumpData = jumpData;
+    constructor(timestampOrObj, jumpData) {
+        if (typeof timestampOrObj === 'object') {
+            super(timestampOrObj.timestamp);
+            this.jumpData = this.hydrate(timestampOrObj.jumpData);
+        }
+        else {
+            super(timestampOrObj);
+            this.jumpData = this.hydrate(jumpData);
+        }
+    }
+    hydrate(data) {
+        return {
+            distance: data.distance instanceof data_distance_1.DataDistance ? data.distance : new data_distance_1.DataDistance(data.distance),
+            height: data.height ? (data.height instanceof data_distance_1.DataDistance ? data.height : new data_distance_1.DataDistance(data.height)) : undefined,
+            score: data.score instanceof DataScore ? data.score : new DataScore(data.score),
+            hang_time: data.hang_time ? (data.hang_time instanceof data_duration_1.DataDuration ? data.hang_time : new data_duration_1.DataDuration(data.hang_time)) : undefined,
+            position_lat: data.position_lat ? (data.position_lat instanceof data_latitude_degrees_1.DataLatitudeDegrees ? data.position_lat : new data_latitude_degrees_1.DataLatitudeDegrees(data.position_lat)) : undefined,
+            position_long: data.position_long ? (data.position_long instanceof data_longitude_degrees_1.DataLongitudeDegrees ? data.position_long : new data_longitude_degrees_1.DataLongitudeDegrees(data.position_long)) : undefined,
+            speed: data.speed ? (data.speed instanceof data_speed_1.DataSpeed ? data.speed : new data_speed_1.DataSpeed(data.speed)) : undefined,
+            rotations: data.rotations ? (data.rotations instanceof DataRotations ? data.rotations : new DataRotations(data.rotations)) : undefined,
+        };
     }
     toJSON() {
+        var _a, _b, _c, _d, _e, _f;
         const json = super.toJSON();
-        return Object.assign(Object.assign({}, json), { jumpData: this.jumpData });
+        return {
+            [DataJumpEvent.type]: {
+                timestamp: this.getValue(),
+                jumpData: {
+                    distance: this.jumpData.distance.getValue(),
+                    height: (_a = this.jumpData.height) === null || _a === void 0 ? void 0 : _a.getValue(),
+                    score: this.jumpData.score.getValue(),
+                    hang_time: (_b = this.jumpData.hang_time) === null || _b === void 0 ? void 0 : _b.getValue(),
+                    position_lat: (_c = this.jumpData.position_lat) === null || _c === void 0 ? void 0 : _c.getValue(),
+                    position_long: (_d = this.jumpData.position_long) === null || _d === void 0 ? void 0 : _d.getValue(),
+                    speed: (_e = this.jumpData.speed) === null || _e === void 0 ? void 0 : _e.getValue(),
+                    rotations: (_f = this.jumpData.rotations) === null || _f === void 0 ? void 0 : _f.getValue(),
+                }
+            }
+        };
     }
 }
 exports.DataJumpEvent = DataJumpEvent;

package/lib/cjs/data/data.jump-event.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/cjs/data/data.jump-event.spec.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const data_jump_event_1 = require("./data.jump-event");
+const data_distance_1 = require("./data.distance");
+const data_speed_1 = require("./data.speed");
+const data_duration_1 = require("./data.duration");
+const data_latitude_degrees_1 = require("./data.latitude-degrees");
+const data_longitude_degrees_1 = require("./data.longitude-degrees");
+describe('DataJumpEvent', () => {
+    const timestamp = 1234567890;
+    // Manual creation requires Data objects
+    const jumpData = {
+        distance: new data_distance_1.DataDistance(5.5),
+        height: new data_distance_1.DataDistance(1.2),
+        score: new data_jump_event_1.DataScore(85),
+        hang_time: new data_duration_1.DataDuration(0.8),
+        position_lat: new data_latitude_degrees_1.DataLatitudeDegrees(40.7128),
+        position_long: new data_longitude_degrees_1.DataLongitudeDegrees(-74.0060),
+        speed: new data_speed_1.DataSpeed(15.2),
+        rotations: new data_jump_event_1.DataRotations(0)
+    };
+    it('should be created using constructor with separate arguments (Manual)', () => {
+        const jumpEvent = new data_jump_event_1.DataJumpEvent(timestamp, jumpData);
+        expect(jumpEvent.getType()).toBe('Jump Event');
+        expect(jumpEvent.getValue()).toBe(timestamp);
+        // Expect exact object match
+        expect(jumpEvent.jumpData).toEqual(jumpData);
+    });
+    it('should be created using constructor with object argument (Manual Object)', () => {
+        const jumpEvent = new data_jump_event_1.DataJumpEvent({ timestamp, jumpData });
+        expect(jumpEvent.getType()).toBe('Jump Event');
+        expect(jumpEvent.getValue()).toBe(timestamp);
+        expect(jumpEvent.jumpData).toEqual(jumpData);
+    });
+    it('should serialize to JSON correctly', () => {
+        const jumpEvent = new data_jump_event_1.DataJumpEvent(timestamp, jumpData);
+        const json = jumpEvent.toJSON();
+        // toJSON output should be simple values
+        expect(json).toEqual({
+            'Jump Event': {
+                timestamp: timestamp,
+                jumpData: {
+                    distance: 5.5,
+                    height: 1.2,
+                    score: 85,
+                    hang_time: 0.8,
+                    position_lat: 40.7128,
+                    position_long: -74.0060,
+                    speed: 15.2,
+                    rotations: 0
+                }
+            }
+        });
+    });
+    it('should hydrate from JSON object correctly (simulating generic importer)', () => {
+        // Generic importer passes primitive values
+        const jsonValue = {
+            timestamp,
+            jumpData: {
+                distance: 5.5,
+                height: 1.2,
+                score: 85,
+                hang_time: 0.8,
+                position_lat: 40.7128,
+                position_long: -74.0060,
+                speed: 15.2,
+                rotations: 0
+            }
+        };
+        // Constructor should hydrate primitives into Data objects
+        const jumpEvent = new data_jump_event_1.DataJumpEvent(jsonValue);
+        expect(jumpEvent.getType()).toBe('Jump Event');
+        expect(jumpEvent.getValue()).toBe(timestamp);
+        // Assertions check if properties are converted to Data objects
+        expect(jumpEvent.jumpData.distance).toBeInstanceOf(data_distance_1.DataDistance);
+        expect(jumpEvent.jumpData.distance.getValue()).toBe(5.5);
+        expect(jumpEvent.jumpData.score).toBeInstanceOf(data_jump_event_1.DataScore);
+        expect(jumpEvent.jumpData.score.getValue()).toBe(85);
+        expect(jumpEvent.jumpData.speed).toBeInstanceOf(data_speed_1.DataSpeed);
+        expect(jumpEvent.jumpData.speed.getValue()).toBe(15.2);
+    });
+});

package/lib/cjs/data/data.rider-position-change-event.d.ts

@@ -3,5 +3,8 @@ import { RiderPosition } from './data.cycling-position';
 export declare class DataRiderPositionChangeEvent extends DataEvent {
     static type: string;
     positionChange: RiderPosition;
-    constructor(index: number, positionChange: RiderPosition);
+    constructor(indexOrObj: number | {
+        index: number;
+        positionChange: RiderPosition;
+    }, positionChange?: RiderPosition);
 }

package/lib/cjs/data/data.rider-position-change-event.js

@@ -3,9 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataRiderPositionChangeEvent = void 0;
 const data_event_1 = require("./data.event");
 class DataRiderPositionChangeEvent extends data_event_1.DataEvent {
-    constructor(index, positionChange) {
-        super(index);
-        this.positionChange = positionChange;
+    constructor(indexOrObj, positionChange) {
+        if (typeof indexOrObj === 'object') {
+            super(indexOrObj.index);
+            this.positionChange = indexOrObj.positionChange;
+        }
+        else {
+            super(indexOrObj);
+            this.positionChange = positionChange;
+        }
     }
 }
 exports.DataRiderPositionChangeEvent = DataRiderPositionChangeEvent;

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

@@ -501,6 +501,8 @@ exports.DataStore = {
     DataGrit: data_grit_1.DataGrit,
     DataJumpCount: data_jump_count_1.DataJumpCount,
     DataJumpEvent: data_jump_event_1.DataJumpEvent,
+    DataScore: data_jump_event_1.DataScore,
+    DataRotations: data_jump_event_1.DataRotations,
     DataLeftPedalSmoothness: data_left_pedal_smoothness_1.DataLeftPedalSmoothness,
     DataLeftTorqueEffectiveness: data_left_torque_effectiveness_1.DataLeftTorqueEffectiveness,
     DataMaxRespirationRate: data_max_respiration_rate_1.DataMaxRespirationRate,

package/lib/cjs/events/adapters/importers/fit/importer.fit.mtb.spec.js

@@ -198,15 +198,15 @@ describe('EventImporterFIT MTB Jumps', () => {
         expect(jumpEvents.length).toBe(11);
         const jump = jumpEvents[0];
         expect(jump.jumpData).toBeDefined();
-        expect((0, helpers_1.isNumber)(jump.jumpData.distance)).toBeTruthy();
-        expect((0, helpers_1.isNumber)(jump.jumpData.score)).toBeTruthy();
+        expect((0, helpers_1.isNumber)(jump.jumpData.distance.getValue())).toBeTruthy();
+        expect((0, helpers_1.isNumber)(jump.jumpData.score.getValue())).toBeTruthy();
         // Verify new jump fields with expected values
-        expect(jump.jumpData.distance).toBeCloseTo(2.069, 2);
-        expect(jump.jumpData.hang_time).toBeCloseTo(0.36, 2);
-        expect(jump.jumpData.score).toBeCloseTo(62.44, 1);
-        expect(jump.jumpData.position_lat).toBeCloseTo(39.6679, 3);
-        expect(jump.jumpData.position_long).toBeCloseTo(20.8382, 3);
-        expect(jump.jumpData.speed).toBeCloseTo(5.748, 2);
+        expect(jump.jumpData.distance.getValue()).toBeCloseTo(2.069, 2);
+        expect(jump.jumpData.hang_time.getValue()).toBeCloseTo(0.36, 2);
+        expect(jump.jumpData.score.getValue()).toBeCloseTo(62.44, 1);
+        expect(jump.jumpData.position_lat.getValue()).toBeCloseTo(39.6679, 3);
+        expect(jump.jumpData.position_long.getValue()).toBeCloseTo(20.8382, 3);
+        expect(jump.jumpData.speed.getValue()).toBeCloseTo(5.748, 2);
         console.log(`Found ${jumpEvents.length} jumps.`);
         console.log('First jump:', jump.jumpData);
         // Verify Jump Statistics (Min, Max, Avg)

package/lib/cjs/index.d.ts

@@ -71,6 +71,8 @@ export * from './data/data.heart-rate-avg';
 export * from './data/data.heart-rate-max';
 export * from './data/data.heart-rate-min';
 export * from './data/data.ibi';
+export * from './data/data.event';
+export * from './data/data.jump-event';
 export * from './data/data.interface';
 export * from './data/data.latitude-degrees';
 export * from './data/data.left-balance';

package/lib/cjs/index.js

@@ -101,6 +101,8 @@ __exportStar(require("./data/data.heart-rate-avg"), exports);
 __exportStar(require("./data/data.heart-rate-max"), exports);
 __exportStar(require("./data/data.heart-rate-min"), exports);
 __exportStar(require("./data/data.ibi"), exports);
+__exportStar(require("./data/data.event"), exports);
+__exportStar(require("./data/data.jump-event"), exports);
 __exportStar(require("./data/data.interface"), exports);
 __exportStar(require("./data/data.latitude-degrees"), exports);
 __exportStar(require("./data/data.left-balance"), exports);

package/lib/esm/data/data.event.d.ts

@@ -1,3 +1,4 @@
 import { DataNumber } from './data.number';
 export declare abstract class DataEvent extends DataNumber {
+    get timestamp(): number;
 }

package/lib/esm/data/data.jump-event.d.ts

@@ -1,17 +1,33 @@
 import { DataEvent } from './data.event';
+import { DataDistance } from './data.distance';
+import { DataSpeed } from './data.speed';
+import { DataDuration } from './data.duration';
+import { DataNumber } from './data.number';
+import { DataLatitudeDegrees } from './data.latitude-degrees';
+import { DataLongitudeDegrees } from './data.longitude-degrees';
+export declare class DataScore extends DataNumber {
+    static type: string;
+}
+export declare class DataRotations extends DataNumber {
+    static type: string;
+}
 export interface JumpEventInterface {
-    distance: number;
-    height?: number;
-    score: number;
-    hang_time?: number;
-    position_lat?: number;
-    position_long?: number;
-    speed?: number;
-    rotations?: number;
+    distance: DataDistance;
+    height?: DataDistance;
+    score: DataScore;
+    hang_time?: DataDuration;
+    position_lat?: DataLatitudeDegrees;
+    position_long?: DataLongitudeDegrees;
+    speed?: DataSpeed;
+    rotations?: DataRotations;
 }
 export declare class DataJumpEvent extends DataEvent {
-    jumpData: JumpEventInterface;
     static type: string;
-    constructor(timestamp: number, jumpData: JumpEventInterface);
+    jumpData: JumpEventInterface;
+    constructor(timestampOrObj: number | {
+        timestamp: number;
+        jumpData: any;
+    }, jumpData?: any);
+    private hydrate;
     toJSON(): any;
 }

package/lib/esm/data/data.jump-event.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/esm/data/data.rider-position-change-event.d.ts

@@ -3,5 +3,8 @@ import { RiderPosition } from './data.cycling-position';
 export declare class DataRiderPositionChangeEvent extends DataEvent {
     static type: string;
     positionChange: RiderPosition;
-    constructor(index: number, positionChange: RiderPosition);
+    constructor(indexOrObj: number | {
+        index: number;
+        positionChange: RiderPosition;
+    }, positionChange?: RiderPosition);
 }

package/lib/esm/index.d.ts

@@ -71,6 +71,8 @@ export * from './data/data.heart-rate-avg';
 export * from './data/data.heart-rate-max';
 export * from './data/data.heart-rate-min';
 export * from './data/data.ibi';
+export * from './data/data.event';
+export * from './data/data.jump-event';
 export * from './data/data.interface';
 export * from './data/data.latitude-degrees';
 export * from './data/data.left-balance';

package/lib/esm/index.js

@@ -3488,6 +3488,9 @@ var DataStepsOld = class extends DataNumber {
 
 // src/data/data.event.ts
 var DataEvent = class extends DataNumber {
+  get timestamp() {
+    return this.getValue();
+  }
 };
 
 // src/data/data.stop-event.ts
@@ -3692,9 +3695,14 @@ var DataRiderPositionChangeEvent = class extends DataEvent {
   static {
     this.type = "Rider Position Change Event";
   }
-  constructor(index, positionChange) {
-    super(index);
-    this.positionChange = positionChange;
+  constructor(indexOrObj, positionChange) {
+    if (typeof indexOrObj === "object") {
+      super(indexOrObj.index);
+      this.positionChange = indexOrObj.positionChange;
+    } else {
+      super(indexOrObj);
+      this.positionChange = positionChange;
+    }
   }
 };
 
@@ -3890,19 +3898,57 @@ var DataJumpCount = class extends DataNumber {
 };
 
 // src/data/data.jump-event.ts
-var DataJumpEvent = class extends DataEvent {
-  constructor(timestamp, jumpData) {
-    super(timestamp);
-    this.jumpData = jumpData;
+var DataScore = class extends DataNumber {
+  static {
+    this.type = "Score";
   }
+};
+var DataRotations = class extends DataNumber {
+  static {
+    this.type = "Rotations";
+  }
+};
+var DataJumpEvent = class _DataJumpEvent extends DataEvent {
   static {
     this.type = "Jump Event";
   }
+  constructor(timestampOrObj, jumpData) {
+    if (typeof timestampOrObj === "object") {
+      super(timestampOrObj.timestamp);
+      this.jumpData = this.hydrate(timestampOrObj.jumpData);
+    } else {
+      super(timestampOrObj);
+      this.jumpData = this.hydrate(jumpData);
+    }
+  }
+  hydrate(data) {
+    return {
+      distance: data.distance instanceof DataDistance ? data.distance : new DataDistance(data.distance),
+      height: data.height ? data.height instanceof DataDistance ? data.height : new DataDistance(data.height) : void 0,
+      score: data.score instanceof DataScore ? data.score : new DataScore(data.score),
+      hang_time: data.hang_time ? data.hang_time instanceof DataDuration ? data.hang_time : new DataDuration(data.hang_time) : void 0,
+      position_lat: data.position_lat ? data.position_lat instanceof DataLatitudeDegrees ? data.position_lat : new DataLatitudeDegrees(data.position_lat) : void 0,
+      position_long: data.position_long ? data.position_long instanceof DataLongitudeDegrees ? data.position_long : new DataLongitudeDegrees(data.position_long) : void 0,
+      speed: data.speed ? data.speed instanceof DataSpeed ? data.speed : new DataSpeed(data.speed) : void 0,
+      rotations: data.rotations ? data.rotations instanceof DataRotations ? data.rotations : new DataRotations(data.rotations) : void 0
+    };
+  }
   toJSON() {
     const json = super.toJSON();
     return {
-      ...json,
-      jumpData: this.jumpData
+      [_DataJumpEvent.type]: {
+        timestamp: this.getValue(),
+        jumpData: {
+          distance: this.jumpData.distance.getValue(),
+          height: this.jumpData.height?.getValue(),
+          score: this.jumpData.score.getValue(),
+          hang_time: this.jumpData.hang_time?.getValue(),
+          position_lat: this.jumpData.position_lat?.getValue(),
+          position_long: this.jumpData.position_long?.getValue(),
+          speed: this.jumpData.speed?.getValue(),
+          rotations: this.jumpData.rotations?.getValue()
+        }
+      }
     };
   }
 };
@@ -4627,6 +4673,8 @@ var DataStore = {
   DataGrit,
   DataJumpCount,
   DataJumpEvent,
+  DataScore,
+  DataRotations,
   DataLeftPedalSmoothness,
   DataLeftTorqueEffectiveness,
   DataMaxRespirationRate,
@@ -12910,6 +12958,7 @@ export {
   DataEPOC,
   DataEVPE,
   DataEnergy,
+  DataEvent,
   DataFeeling,
   DataGPSAltitude,
   DataGradeAdjustedPace,
@@ -12935,6 +12984,7 @@ export {
   DataHeartRateMax,
   DataHeartRateMin,
   DataIBI,
+  DataJumpEvent,
   DataLatitudeDegrees,
   DataLeftBalance,
   DataLeftPedalSmoothness,
@@ -12958,6 +13008,8 @@ export {
   DataRightBalance,
   DataRightPedalSmoothness,
   DataRightTorqueEffectiveness,
+  DataRotations,
+  DataScore,
   DataSeaLevelPressure,
   DataSpeed,
   DataSpeedAvg,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sports-alliance/sports-lib",
-  "version": "7.2.3",
+  "version": "7.2.4",
   "description": "A Library to for importing / exporting and processing GPX, TCX, FIT and JSON files from services such as Strava, Movescount, Garmin, Polar etc",
   "keywords": [
     "gpx",