@sports-alliance/sports-lib 7.0.2 → 7.0.4

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.array.d.ts

@@ -1,7 +1,6 @@
 import { DataBare } from './data.bare';
-export declare abstract class DataArray extends DataBare {
-    protected value: string[];
+export declare abstract class DataArray extends DataBare<string[]> {
     constructor(value: string[]);
-    getValue(): string[];
+    getValue(formatForDataType?: string): string[];
     isValueTypeValid(value: any): boolean;
 }

package/lib/cjs/data/data.array.js

@@ -7,7 +7,7 @@ class DataArray extends data_bare_1.DataBare {
         super(value);
         this.value = value;
     }
-    getValue() {
+    getValue(formatForDataType) {
         return this.value;
     }
     isValueTypeValid(value) {

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

@@ -1,4 +1,5 @@
 import { Data } from './data';
-export declare abstract class DataBare extends Data {
+import { DataPositionInterface } from './data.position.interface';
+export declare abstract class DataBare<T extends number | string | boolean | string[] | DataPositionInterface = number | string | boolean | string[] | DataPositionInterface> extends Data<T> {
     static unit: string;
 }

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

@@ -1,15 +1,15 @@
 import { DataInterface, UnitSystem } from './data.interface';
 import { DataJSONInterface } from './data.json.interface';
 import { DataPositionInterface } from './data.position.interface';
-export declare abstract class Data implements DataInterface {
+export declare abstract class Data<T extends number | string | boolean | string[] | DataPositionInterface = number | string | boolean | string[] | DataPositionInterface> implements DataInterface {
     static type: string;
     static unit: string;
     static displayType?: string;
     static unitSystem: UnitSystem;
-    protected value: number | string | boolean | string[] | DataPositionInterface;
-    protected constructor(value: string | number | boolean | string[] | DataPositionInterface);
-    setValue(value: string | number | boolean | string[] | DataPositionInterface): this;
-    getValue(formatForDataType?: string): string | number | boolean | string[] | DataPositionInterface;
+    protected value: T;
+    protected constructor(value: T);
+    setValue(value: number | string | boolean | string[] | DataPositionInterface): this;
+    getValue(formatForDataType?: string): T;
     getDisplayValue(): number | string | string[];
     getType(): string;
     getUnit(): string;

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

@@ -1,6 +1,5 @@
 import { DataBare } from './data.bare';
-export declare abstract class DataNumber extends DataBare {
-    protected value: number;
+export declare abstract class DataNumber extends DataBare<number> {
     constructor(value: number);
     getValue(formatForDataType?: string): number;
     isValueTypeValid(value: any): boolean;

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

@@ -1,10 +1,9 @@
 import { DataBare } from './data.bare';
 import { DataPositionInterface } from './data.position.interface';
-export declare class DataPosition extends DataBare {
+export declare class DataPosition extends DataBare<DataPositionInterface> {
     static type: string;
-    protected value: DataPositionInterface;
     constructor(value: DataPositionInterface);
-    getValue(): DataPositionInterface;
+    getValue(formatForDataType?: string): DataPositionInterface;
     getDisplayValue(): string;
     isValueTypeValid(value: any): boolean;
 }

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

@@ -8,7 +8,7 @@ class DataPosition extends data_bare_1.DataBare {
         super(value);
         this.value = value;
     }
-    getValue() {
+    getValue(formatForDataType) {
         return this.value;
     }
     getDisplayValue() {

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

@@ -1,7 +1,6 @@
 import { DataBare } from './data.bare';
-export declare abstract class DataString extends DataBare {
-    protected value: string;
+export declare abstract class DataString extends DataBare<string> {
     constructor(value: string);
-    getValue(): string;
+    getValue(formatForDataType?: string): string;
     isValueTypeValid(value: any): boolean;
 }

package/lib/cjs/data/data.string.js

@@ -7,7 +7,7 @@ class DataString extends data_bare_1.DataBare {
         super(value);
         this.value = value;
     }
-    getValue() {
+    getValue(formatForDataType) {
         return this.value;
     }
     isValueTypeValid(value) {

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

@@ -429,8 +429,9 @@ class EventImporterFIT {
         return deviceInfos.map((deviceInfo) => {
             const device = new device_1.Device(deviceInfo.device_type);
             device.index = deviceInfo.device_index;
-            device.name = importer_fit_ant_plus_device_names_1.ImporterFitAntPlusDeviceNames[deviceInfo.ant_device_number] || deviceInfo.ant_device_number;
+            device.name = deviceInfo.product_name || importer_fit_ant_plus_device_names_1.ImporterFitAntPlusDeviceNames[deviceInfo.ant_device_number] || deviceInfo.ant_device_number;
             device.batteryStatus = deviceInfo.battery_status;
+            device.batteryLevel = (0, helpers_1.isNumber)(deviceInfo.battery_level) ? deviceInfo.battery_level : deviceInfo.battery_soc;
             device.batteryVoltage = deviceInfo.battery_voltage;
             device.manufacturer = deviceInfo.manufacturer;
             device.serialNumber = deviceInfo.serial_number;

package/lib/cjs/events/adapters/importers/json/importer.json.js

@@ -58,6 +58,9 @@ class EventImporterJSON {
         if (json.batteryStatus) {
             device.batteryStatus = json.batteryStatus;
         }
+        if (json.batteryLevel) {
+            device.batteryLevel = json.batteryLevel;
+        }
         if (json.batteryVoltage) {
             device.batteryVoltage = json.batteryVoltage;
         }

package/lib/cjs/events/adapters/importers/tcx/utils.tcx.js

@@ -13,7 +13,10 @@ const findChildNodeValue = (fromNodeList, childNodeName) => {
     const predicate = (childNode) => childNode.nodeName === childNodeName || childNode.nodeName.match(childNodeName) !== null;
     let value = (_b = (_a = Array.from(fromNodeList).find(predicate)) === null || _a === void 0 ? void 0 : _a.firstChild) === null || _b === void 0 ? void 0 : _b.nodeValue;
     value = value !== undefined ? value : null;
-    return value === null ? value : Number(value);
+    if (value === null) {
+        return null;
+    }
+    return Number(value);
 };
 exports.findChildNodeValue = findChildNodeValue;
 // Fetch activity track point extensions according https://www8.garmin.com/xmlschemas/ActivityExtensionv2.xsd schema

package/lib/esm/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/esm/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/esm/activities/devices/device.js

@@ -8,6 +8,7 @@ export class Device {
             type: this.type,
             index: 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/esm/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/esm/data/data.array.d.ts

@@ -1,7 +1,6 @@
 import { DataBare } from './data.bare';
-export declare abstract class DataArray extends DataBare {
-    protected value: string[];
+export declare abstract class DataArray extends DataBare<string[]> {
     constructor(value: string[]);
-    getValue(): string[];
+    getValue(formatForDataType?: string): string[];
     isValueTypeValid(value: any): boolean;
 }

package/lib/esm/data/data.array.js

@@ -4,7 +4,7 @@ export class DataArray extends DataBare {
         super(value);
         this.value = value;
     }
-    getValue() {
+    getValue(formatForDataType) {
         return this.value;
     }
     isValueTypeValid(value) {

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

@@ -1,4 +1,5 @@
 import { Data } from './data';
-export declare abstract class DataBare extends Data {
+import { DataPositionInterface } from './data.position.interface';
+export declare abstract class DataBare<T extends number | string | boolean | string[] | DataPositionInterface = number | string | boolean | string[] | DataPositionInterface> extends Data<T> {
     static unit: string;
 }

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

@@ -1,15 +1,15 @@
 import { DataInterface, UnitSystem } from './data.interface';
 import { DataJSONInterface } from './data.json.interface';
 import { DataPositionInterface } from './data.position.interface';
-export declare abstract class Data implements DataInterface {
+export declare abstract class Data<T extends number | string | boolean | string[] | DataPositionInterface = number | string | boolean | string[] | DataPositionInterface> implements DataInterface {
     static type: string;
     static unit: string;
     static displayType?: string;
     static unitSystem: UnitSystem;
-    protected value: number | string | boolean | string[] | DataPositionInterface;
-    protected constructor(value: string | number | boolean | string[] | DataPositionInterface);
-    setValue(value: string | number | boolean | string[] | DataPositionInterface): this;
-    getValue(formatForDataType?: string): string | number | boolean | string[] | DataPositionInterface;
+    protected value: T;
+    protected constructor(value: T);
+    setValue(value: number | string | boolean | string[] | DataPositionInterface): this;
+    getValue(formatForDataType?: string): T;
     getDisplayValue(): number | string | string[];
     getType(): string;
     getUnit(): string;

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

@@ -1,6 +1,5 @@
 import { DataBare } from './data.bare';
-export declare abstract class DataNumber extends DataBare {
-    protected value: number;
+export declare abstract class DataNumber extends DataBare<number> {
     constructor(value: number);
     getValue(formatForDataType?: string): number;
     isValueTypeValid(value: any): boolean;

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

@@ -1,10 +1,9 @@
 import { DataBare } from './data.bare';
 import { DataPositionInterface } from './data.position.interface';
-export declare class DataPosition extends DataBare {
+export declare class DataPosition extends DataBare<DataPositionInterface> {
     static type: string;
-    protected value: DataPositionInterface;
     constructor(value: DataPositionInterface);
-    getValue(): DataPositionInterface;
+    getValue(formatForDataType?: string): DataPositionInterface;
     getDisplayValue(): string;
     isValueTypeValid(value: any): boolean;
 }

package/lib/esm/data/data.position.js

@@ -5,7 +5,7 @@ export class DataPosition extends DataBare {
         super(value);
         this.value = value;
     }
-    getValue() {
+    getValue(formatForDataType) {
         return this.value;
     }
     getDisplayValue() {

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

@@ -1,7 +1,6 @@
 import { DataBare } from './data.bare';
-export declare abstract class DataString extends DataBare {
-    protected value: string;
+export declare abstract class DataString extends DataBare<string> {
     constructor(value: string);
-    getValue(): string;
+    getValue(formatForDataType?: string): string;
     isValueTypeValid(value: any): boolean;
 }

package/lib/esm/data/data.string.js

@@ -4,7 +4,7 @@ export class DataString extends DataBare {
         super(value);
         this.value = value;
     }
-    getValue() {
+    getValue(formatForDataType) {
         return this.value;
     }
     isValueTypeValid(value) {

package/lib/esm/events/adapters/importers/fit/importer.fit.js

@@ -423,8 +423,9 @@ export class EventImporterFIT {
         return deviceInfos.map((deviceInfo) => {
             const device = new Device(deviceInfo.device_type);
             device.index = deviceInfo.device_index;
-            device.name = ImporterFitAntPlusDeviceNames[deviceInfo.ant_device_number] || deviceInfo.ant_device_number;
+            device.name = deviceInfo.product_name || ImporterFitAntPlusDeviceNames[deviceInfo.ant_device_number] || deviceInfo.ant_device_number;
             device.batteryStatus = deviceInfo.battery_status;
+            device.batteryLevel = isNumber(deviceInfo.battery_level) ? deviceInfo.battery_level : deviceInfo.battery_soc;
             device.batteryVoltage = deviceInfo.battery_voltage;
             device.manufacturer = deviceInfo.manufacturer;
             device.serialNumber = deviceInfo.serial_number;

package/lib/esm/events/adapters/importers/json/importer.json.js

@@ -55,6 +55,9 @@ export class EventImporterJSON {
         if (json.batteryStatus) {
             device.batteryStatus = json.batteryStatus;
         }
+        if (json.batteryLevel) {
+            device.batteryLevel = json.batteryLevel;
+        }
         if (json.batteryVoltage) {
             device.batteryVoltage = json.batteryVoltage;
         }

package/lib/esm/events/adapters/importers/tcx/utils.tcx.js

@@ -9,7 +9,10 @@ export const findChildNodeValue = (fromNodeList, childNodeName) => {
     const predicate = (childNode) => childNode.nodeName === childNodeName || childNode.nodeName.match(childNodeName) !== null;
     let value = (_b = (_a = Array.from(fromNodeList).find(predicate)) === null || _a === void 0 ? void 0 : _a.firstChild) === null || _b === void 0 ? void 0 : _b.nodeValue;
     value = value !== undefined ? value : null;
-    return value === null ? value : Number(value);
+    if (value === null) {
+        return null;
+    }
+    return Number(value);
 };
 // Fetch activity track point extensions according https://www8.garmin.com/xmlschemas/ActivityExtensionv2.xsd schema
 export const findTrackPointExtensionValue = (childNodes, extensionName) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sports-alliance/sports-lib",
-  "version": "7.0.2",
+  "version": "7.0.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",