@utiliread/primitives 1.0.0-32 → 1.0.0-36

package/src/precision-number.ts

@@ -1,13 +1,28 @@
-import { NumberFormatter } from "./number-formatter";
+import { invariantDecimalSeparator } from ".";
+import { localeDecimalSeparator, NumberFormatter } from "./number-formatter";
 
 export class PrecisionNumber {
     constructor(public value: number, public precision: number) {
     }
 
+    static parse(input: string) {
+        const normalized = input.trim().replace(",", ".").replace(localeDecimalSeparator, invariantDecimalSeparator);
+        const precision = normalized.replace(".", "").replace("+", "").replace("-", "").length;
+        return new PrecisionNumber(parseFloat(normalized), precision);
+    }
+
     toString() {
         return this.value.toString();
     }
 
+    toFixed() {
+        return NumberFormatter.toFixed(this.value, this.precision);
+    }
+
+    toPrecision() {
+        return NumberFormatter.toPrecision(this.value, this.precision);
+    }
+
     toLocaleFixed() {
         return NumberFormatter.toLocaleFixed(this.value, this.precision);
     }
@@ -15,4 +30,4 @@ export class PrecisionNumber {
     toLocalePrecision() {
         return NumberFormatter.toLocalePrecision(this.value, this.precision);
     }
-}
+}

package/src/register-convention.spec.ts

@@ -1,43 +1,43 @@
-import { expect } from "chai";
-import { RegisterConvention } from "./register-convention";
-
-describe("getAggregate", () => {
-    it("instant register is instant", () => {
-        const result = RegisterConvention.getAggregate("flowTemperature");
-        expect(result).to.equal("instant");
-    });
-
-    it("avg register is avg", () => {
-        const result = RegisterConvention.getAggregate("avgFlowTemperature");
-        expect(result).to.equal("avg");
-    });
+import { expect } from "chai";
+import { RegisterConvention } from "./register-convention";
+
+describe("getAggregate", () => {
+    it("instant register is instant", () => {
+        const result = RegisterConvention.getAggregate("flowTemperature");
+        expect(result).to.equal("instant");
+    });
+
+    it("avg register is avg", () => {
+        const result = RegisterConvention.getAggregate("avgFlowTemperature");
+        expect(result).to.equal("avg");
+    });
+});
+
+describe("toInstant", () => {
+    it("should convert instant", () => {
+        const registerId = RegisterConvention.toInstant("flowTemperature");
+        expect(registerId).to.equal("flowTemperature");
+    });
+
+    it("should convert aggregate", () => {
+        const registerId = RegisterConvention.toInstant("avgFlowTemperature");
+        expect(registerId).to.equal("flowTemperature");
+    });
+});
+
+describe("toAggregate", () => {
+    it("should convert instant to aggregate", () => {
+        const registerId = RegisterConvention.toAggregate("flowTemperature", "avg");
+        expect(registerId).to.equal("avgFlowTemperature");
+    });
+
+    it("should convert aggregate to same aggregate", () => {
+        const registerId = RegisterConvention.toAggregate("avgFlowTemperature", "avg");
+        expect(registerId).to.equal("avgFlowTemperature");
+    });
+
+    it("should convert aggregate to other aggregate", () => {
+        const registerId = RegisterConvention.toAggregate("avgFlowTemperature", "min");
+        expect(registerId).to.equal("minFlowTemperature");
+    });
 });
-
-describe("toInstant", () => {
-    it("should convert instant", () => {
-        const registerId = RegisterConvention.toInstant("flowTemperature");
-        expect(registerId).to.equal("flowTemperature");
-    });
-
-    it("should convert aggregate", () => {
-        const registerId = RegisterConvention.toInstant("avgFlowTemperature");
-        expect(registerId).to.equal("flowTemperature");
-    });
-});
-
-describe("toAggregate", () => {
-    it("should convert instant to aggregate", () => {
-        const registerId = RegisterConvention.toAggregate("flowTemperature", "avg");
-        expect(registerId).to.equal("avgFlowTemperature");
-    });
-
-    it("should convert aggregate to same aggregate", () => {
-        const registerId = RegisterConvention.toAggregate("avgFlowTemperature", "avg");
-        expect(registerId).to.equal("avgFlowTemperature");
-    });
-
-    it("should convert aggregate to other aggregate", () => {
-        const registerId = RegisterConvention.toAggregate("avgFlowTemperature", "min");
-        expect(registerId).to.equal("minFlowTemperature");
-    });
-});

package/src/register-convention.ts

@@ -1,61 +1,61 @@
-import { RegisterDefinition } from ".";
-import { AggregateId } from "./aggregate-id";
-import { RegisterId } from "./register-id";
-import { getRegisterId } from "./register-utils";
-
-export const aggregatePrefixes: { [aggregateId in AggregateId]: string } = {
-    instant: "",
-    diff: "diff",
-    min: "min",
-    max: "max",
-    avg: "avg",
-    sum: "sum",
-    cnt: "cnt",
-    ssq: "ssq",
-};
-
-class Convention {
-    public getAggregate(register: RegisterId | RegisterDefinition) {
-        const registerId = getRegisterId(register);
-        // Brute force all prefixes - if none of them, then it must be instant.
-        for (const aggregateString of Object.keys(aggregatePrefixes)) {
-            const aggregate = <AggregateId>aggregateString;
-            const prefix = aggregatePrefixes[aggregate];
-            if (prefix.length && isPrefix(registerId, prefix)) {
-                // Not instant - it was any of the others.
-                return aggregate;
-            }
-        }
-        return "instant";
-    }
-
-    toInstant(register: RegisterId | RegisterDefinition) {
-        const registerId = getRegisterId(register);
-        for (const prefix of Object.values(aggregatePrefixes)) {
-            if (prefix.length && isPrefix(registerId, prefix)) {
-                const tail = registerId.substr(prefix.length);
-                return <RegisterId>(tail[0].toLowerCase() + tail.substr(1));
-            }
-        }
-        return registerId;
-    }
-
-    toAggregate(register: RegisterId | RegisterDefinition, aggregate: AggregateId) {
-        const instantRegisterId = this.toInstant(register);
-        if (aggregate === "instant") {
-            return instantRegisterId;
-        }
-        const prefix = aggregatePrefixes[aggregate];
-        return <RegisterId>(prefix + instantRegisterId[0].toUpperCase() + instantRegisterId.substr(1));
-    }
-}
-
-export function isPrefix(registerId: RegisterId, prefix: string) {
-    return registerId.startsWith(prefix) && isUppercase(registerId[prefix.length]);
-}
-
-function isUppercase(input: string) {
-    return input.toUpperCase() === input;
-}
-
-export const RegisterConvention = new Convention();
+import { RegisterDefinition } from ".";
+import { AggregateId } from "./aggregate-id";
+import { RegisterId } from "./register-id";
+import { getRegisterId } from "./register-utils";
+
+export const aggregatePrefixes: { [aggregateId in AggregateId]: string } = {
+    instant: "",
+    diff: "diff",
+    min: "min",
+    max: "max",
+    avg: "avg",
+    sum: "sum",
+    cnt: "cnt",
+    ssq: "ssq",
+};
+
+class Convention {
+    public getAggregate(register: RegisterId | RegisterDefinition) {
+        const registerId = getRegisterId(register);
+        // Brute force all prefixes - if none of them, then it must be instant.
+        for (const aggregateString of Object.keys(aggregatePrefixes)) {
+            const aggregate = <AggregateId>aggregateString;
+            const prefix = aggregatePrefixes[aggregate];
+            if (prefix.length && isPrefix(registerId, prefix)) {
+                // Not instant - it was any of the others.
+                return aggregate;
+            }
+        }
+        return "instant";
+    }
+
+    toInstant(register: RegisterId | RegisterDefinition) {
+        const registerId = getRegisterId(register);
+        for (const prefix of Object.values(aggregatePrefixes)) {
+            if (prefix.length && isPrefix(registerId, prefix)) {
+                const tail = registerId.substr(prefix.length);
+                return <RegisterId>(tail[0].toLowerCase() + tail.substr(1));
+            }
+        }
+        return registerId;
+    }
+
+    toAggregate(register: RegisterId | RegisterDefinition, aggregate: AggregateId) {
+        const instantRegisterId = this.toInstant(register);
+        if (aggregate === "instant") {
+            return instantRegisterId;
+        }
+        const prefix = aggregatePrefixes[aggregate];
+        return <RegisterId>(prefix + instantRegisterId[0].toUpperCase() + instantRegisterId.substr(1));
+    }
+}
+
+export function isPrefix(registerId: RegisterId, prefix: string) {
+    return registerId.startsWith(prefix) && isUppercase(registerId[prefix.length]);
+}
+
+function isUppercase(input: string) {
+    return input.toUpperCase() === input;
+}
+
+export const RegisterConvention = new Convention();

package/src/register-definition.ts

@@ -1,17 +1,17 @@
-import { UnitId } from ".";
-import { AggregateId } from "./aggregate-id";
-import { MeasureId } from "./measure-id";
-import { RegisterId } from "./register-id";
-
-export interface RegisterDefinition {
-    /// The id of the register
-    id: RegisterId;
-    /// The register measure
-    measure: MeasureId;
-    /// The aggregate of the register
-    aggregate: AggregateId;
-    /// The possible register units
-    units: ReadonlyArray<UnitId>;
-    /// Whether the register can only be resolved by "present value".
-    immediate?: true;
-}
+import { UnitId } from ".";
+import { AggregateId } from "./aggregate-id";
+import { MeasureId } from "./measure-id";
+import { RegisterId } from "./register-id";
+
+export interface RegisterDefinition {
+    /// The id of the register
+    id: RegisterId;
+    /// The register measure
+    measure: MeasureId;
+    /// The aggregate of the register
+    aggregate: AggregateId;
+    /// The possible register units
+    units: ReadonlyArray<UnitId>;
+    /// Whether the register can only be resolved by "present value".
+    immediate?: true;
+}

package/src/register-id.ts

@@ -1,191 +1,197 @@
-export type RegisterId =
-    "none" |
-    
-    "heatEnergy" |
-    "diffHeatEnergy" |
-
-    "heatEnergyVolumeInInlet" |
-    "diffHeatEnergyVolumeInInlet" |
-
-    "heatEnergyVolumeInOutlet" |
-    "diffHeatEnergyVolumeInOutlet" |
-
-    "coolingEnergy" |
-    "diffCoolingEnergy" |
-
-    "coolingEnergyVolumeInInlet" |
-    "diffCoolingEnergyVolumeInInlet" |
-
-    "coolingEnergyVolumeInOutlet" |
-    "diffCoolingEnergyVolumeInOutlet" |
-
-    "electricalEnergy" |
-    "diffElectricalEnergy" |
-
-    "reactiveEnergy" |
-    "diffReactiveEnergy" |
-
-    "volume" |
-    "diffVolume" |
-
-    "inletVolume" |
-    "diffInletVolume" |
-
-    "outletVolume" |
-    "diffOutletVolume" |
-
-    "pulseInputAVolume" |
-    "diffPulseInputAVolume" |
-
-    "pulseInputBVolume" |
-    "diffPulseInputBVolume" |
-
-    "mass" |
-    "diffMass" |
-
-    "inletMass" |
-    "diffInletMass" |
-
-    "outletMass" |
-    "diffOutletMass" |
-
-    "power" |
-    "maxPower" |
-    "minPower" |
-    "avgPower" |
-
-    "inletPower" |
-    "maxInletPower" |
-    "minInletPower" |
-    "avgInletPower" |
-
-    "outletPower" |
-    "maxOutletPower" |
-    "minOutletPower" |
-    "avgOutletPower" |
-
-    "volumeFlow" |
-    "maxVolumeFlow" |
-    "minVolumeFlow" |
-    "avgVolumeFlow" |
-
-    "inletVolumeFlow" |
-    "maxInletVolumeFlow" |
-    "minInletVolumeFlow" |
-    "avgInletVolumeFlow" |
-
-    "outletVolumeFlow" |
-    "maxOutletVolumeFlow" |
-    "minOutletVolumeFlow" |
-    "avgOutletVolumeFlow" |
-
-    "massFlow" |
-    "maxMassFlow" |
-    "minMassFlow" |
-    "avgMassFlow" |
-
-    "inletMassFlow" |
-    "maxInletMassFlow" |
-    "minInletMassFlow" |
-    "avgInletMassFlow" |
-
-    "outletMassFlow" |
-    "maxOutletMassFlow" |
-    "minOutletMassFlow" |
-    "avgOutletMassFlow" |
-
-    "flowTemperature" |
-    "maxFlowTemperature" |
-    "minFlowTemperature" |
-    "avgFlowTemperature" |
-
-    "inletFlowTemperature" |
-    "maxInletFlowTemperature" |
-    "minInletFlowTemperature" |
-    "avgInletFlowTemperature" |
-
-    "outletFlowTemperature" |
-    "maxOutletFlowTemperature" |
-    "minOutletFlowTemperature" |
-    "avgOutletFlowTemperature" |
-
-    "inletMinusOutletFlowTemperatureDifference" |
-    "maxInletMinusOutletFlowTemperatureDifference" |
-    "minInletMinusOutletFlowTemperatureDifference" |
-    "avgInletMinusOutletFlowTemperatureDifference" |
-
-    "outletMinusInletFlowTemperatureDifference" |
-    "maxOutletMinusInletFlowTemperatureDifference" |
-    "minOutletMinusInletFlowTemperatureDifference" |
-    "avgOutletMinusInletFlowTemperatureDifference" |
-
-    "ambientTemperature" |
-    "maxAmbientTemperature" |
-    "minAmbientTemperature" |
-    "avgAmbientTemperature" |
-
-    "radiatorTemperature" |
-    "maxRadiatorTemperature" |
-    "minRadiatorTemperature" |
-    "avgRadiatorTemperature" |
-
-    "relativeHumidity" |
-
-    "kamstrupE8Inlet" |
-    "diffKamstrupE8Inlet" |
-    "kamstrupE9Outlet" |
-    "diffKamstrupE9Outlet" |
-
-    "operatingTime" |
-    "diffOperatingTime" |
-
-    "remainingBatteryTime" |
-    "diffRemainingBatteryTime" |
-
-    "deviceDate" |
-    "deviceTime" |
-    "deviceDateTime" |
-
-    "timeSinceLastExactOverhearingArrived" |
-    "timeAtLastExactOverhearingArrived" |
-
-    "timeSinceLastPossibleCandidateOverhearingArrived" |
-    "timeAtLastPossibleCandidateOverhearingArrived" |
-    
-    "timeSinceLastSampled" |
-    "timeAtLastSampled" |
-    
-    "timeSinceLastInstallationMounted" |
-    "timeAtLastInstallationMounted" |
-
-    "basetime" |
-
-    "device" |
-    "wMBusDeviceAddresses" |
-    "kamdraftDeviceAddresses" |
-    "tchlrDeviceAddresses" |
-    "kamdaDeviceAddresses" |
-    "msisdnDeviceAddresses" |
-    "deviceRegisters" |
-    "consumptionZone" |
-
-    "mBusFormatStringSignature" |
-
-    "kamstrupMulticalInfocodeType1" |
-    "kamstrupMulticalInfocodeType2" |
-    "kamstrupMulticalInfocodeType3" |
-    "kamstrupMulticalInfocodeType4" |
-    "kamstrupMulticalInfocode" |
-    "kamstrupModuleType" |
-    
-    "diehlInfocodeType1" |
-    "diehlInfocode" |
-
-    "landisGyrMBusStatusType1" |
-    "landisGyrMBusStatusType2" |
-    "landisGyrMBusStatus" |
-    "landisGyrInfocodeType1" |
-    "landisGyrInfocodeType2" |
-    "landisGyrInfocode" |
-    
-    "infocode";
+export type RegisterId =
+    "none" |
+    
+    "heatEnergy" |
+    "diffHeatEnergy" |
+
+    "heatEnergyVolumeInInlet" |
+    "diffHeatEnergyVolumeInInlet" |
+
+    "heatEnergyVolumeInOutlet" |
+    "diffHeatEnergyVolumeInOutlet" |
+
+    "coolingEnergy" |
+    "diffCoolingEnergy" |
+
+    "coolingEnergyVolumeInInlet" |
+    "diffCoolingEnergyVolumeInInlet" |
+
+    "coolingEnergyVolumeInOutlet" |
+    "diffCoolingEnergyVolumeInOutlet" |
+
+    "electricalEnergy" |
+    "diffElectricalEnergy" |
+
+    "reactiveEnergy" |
+    "diffReactiveEnergy" |
+
+    "volume" |
+    "diffVolume" |
+
+    "inletVolume" |
+    "diffInletVolume" |
+
+    "outletVolume" |
+    "diffOutletVolume" |
+
+    "pulseInputAVolume" |
+    "diffPulseInputAVolume" |
+
+    "pulseInputBVolume" |
+    "diffPulseInputBVolume" |
+
+    "mass" |
+    "diffMass" |
+
+    "inletMass" |
+    "diffInletMass" |
+
+    "outletMass" |
+    "diffOutletMass" |
+
+    "power" |
+    "maxPower" |
+    "minPower" |
+    "avgPower" |
+
+    "inletPower" |
+    "maxInletPower" |
+    "minInletPower" |
+    "avgInletPower" |
+
+    "outletPower" |
+    "maxOutletPower" |
+    "minOutletPower" |
+    "avgOutletPower" |
+
+    "volumeFlow" |
+    "maxVolumeFlow" |
+    "minVolumeFlow" |
+    "avgVolumeFlow" |
+
+    "inletVolumeFlow" |
+    "maxInletVolumeFlow" |
+    "minInletVolumeFlow" |
+    "avgInletVolumeFlow" |
+
+    "outletVolumeFlow" |
+    "maxOutletVolumeFlow" |
+    "minOutletVolumeFlow" |
+    "avgOutletVolumeFlow" |
+
+    "massFlow" |
+    "maxMassFlow" |
+    "minMassFlow" |
+    "avgMassFlow" |
+
+    "inletMassFlow" |
+    "maxInletMassFlow" |
+    "minInletMassFlow" |
+    "avgInletMassFlow" |
+
+    "outletMassFlow" |
+    "maxOutletMassFlow" |
+    "minOutletMassFlow" |
+    "avgOutletMassFlow" |
+
+    "flowTemperature" |
+    "maxFlowTemperature" |
+    "minFlowTemperature" |
+    "avgFlowTemperature" |
+
+    "inletFlowTemperature" |
+    "maxInletFlowTemperature" |
+    "minInletFlowTemperature" |
+    "avgInletFlowTemperature" |
+
+    "outletFlowTemperature" |
+    "maxOutletFlowTemperature" |
+    "minOutletFlowTemperature" |
+    "avgOutletFlowTemperature" |
+
+    "inletMinusOutletFlowTemperatureDifference" |
+    "maxInletMinusOutletFlowTemperatureDifference" |
+    "minInletMinusOutletFlowTemperatureDifference" |
+    "avgInletMinusOutletFlowTemperatureDifference" |
+
+    "outletMinusInletFlowTemperatureDifference" |
+    "maxOutletMinusInletFlowTemperatureDifference" |
+    "minOutletMinusInletFlowTemperatureDifference" |
+    "avgOutletMinusInletFlowTemperatureDifference" |
+
+    "ambientTemperature" |
+    "maxAmbientTemperature" |
+    "minAmbientTemperature" |
+    "avgAmbientTemperature" |
+
+    "radiatorTemperature" |
+    "maxRadiatorTemperature" |
+    "minRadiatorTemperature" |
+    "avgRadiatorTemperature" |
+
+    "relativeHumidity" |
+
+    "kamstrupE8Inlet" |
+    "diffKamstrupE8Inlet" |
+    "kamstrupE9Outlet" |
+    "diffKamstrupE9Outlet" |
+
+    "operatingTime" |
+    "diffOperatingTime" |
+
+    "remainingBatteryTime" |
+    "diffRemainingBatteryTime" |
+
+    "deviceDate" |
+    "deviceTime" |
+    "deviceDateTime" |
+
+    "timeSinceLastExactOverhearingArrived" |
+    "timeAtLastExactOverhearingArrived" |
+
+    "timeSinceLastPossibleCandidateOverhearingArrived" |
+    "timeAtLastPossibleCandidateOverhearingArrived" |
+    
+    "timeSinceLastSampled" |
+    "timeAtLastSampled" |
+    
+    "timeSinceLastInstallationMounted" |
+    "timeAtLastInstallationMounted" |
+
+    "basetime" |
+    "instantTime" |
+    "periodStartTime" |
+    "periodEndTime" |
+    "instantOrPeriodStartTime" |
+    "instantOrPeriodEndTime" |
+
+    "device" |
+    "wMBusDeviceAddresses" |
+    "kamdraftDeviceAddresses" |
+    "tchlrDeviceAddresses" |
+    "kamdaDeviceAddresses" |
+    "msisdnDeviceAddresses" |
+    "deviceRegisters" |
+    "consumptionZone" |
+
+    "mBusFormatStringSignature" |
+    "deviceSoftwareVersion" |
+
+    "kamstrupMulticalInfocodeType1" |
+    "kamstrupMulticalInfocodeType2" |
+    "kamstrupMulticalInfocodeType3" |
+    "kamstrupMulticalInfocodeType4" |
+    "kamstrupMulticalInfocode" |
+    "kamstrupModuleType" |
+    
+    "diehlInfocodeType1" |
+    "diehlInfocode" |
+
+    "landisGyrMBusStatusType1" |
+    "landisGyrMBusStatusType2" |
+    "landisGyrMBusStatus" |
+    "landisGyrInfocodeType1" |
+    "landisGyrInfocodeType2" |
+    "landisGyrInfocode" |
+    
+    "infocode";