@utiliread/primitives 1.0.0-70 → 1.0.0-72

package/dist/esm/register-pack.d.ts

@@ -1,4 +1,4 @@
-import { RegisterDefinition } from "./register-definition";
-export interface RegisterPack {
-    [key: string]: RegisterDefinition;
-}
+import { RegisterDefinition } from "./register-definition";
+export interface RegisterPack {
+    [key: string]: RegisterDefinition;
+}

package/dist/esm/register-pack.js

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=register-pack.js.map

package/dist/esm/register-utils.d.ts

@@ -1,3 +1,3 @@
-import { RegisterDefinition } from "./register-definition";
-import { RegisterId } from "./register-id";
-export declare function getRegisterId(register: RegisterId | RegisterDefinition): RegisterId;
+import { RegisterDefinition } from "./register-definition";
+import { RegisterId } from "./register-id";
+export declare function getRegisterId(register: RegisterId | RegisterDefinition): RegisterId;

package/dist/esm/register-utils.js

@@ -1,4 +1,4 @@
-export function getRegisterId(register) {
-    return typeof register === "string" ? register : register.id;
-}
+export function getRegisterId(register) {
+    return typeof register === "string" ? register : register.id;
+}
 //# sourceMappingURL=register-utils.js.map

package/dist/esm/repository.d.ts

@@ -1,9 +1,9 @@
-export type Repository = "some/repo";
-export declare function Repository(repo: string): Repository;
-export declare function Repository(team: string, name: string): Repository;
-export declare namespace Repository {
-    function split(repo: Repository): {
-        team: string;
-        name: string;
-    };
-}
+export type Repository = "some/repo";
+export declare function Repository(repo: string): Repository;
+export declare function Repository(team: string, name: string): Repository;
+export declare namespace Repository {
+    function split(repo: Repository): {
+        team: string;
+        name: string;
+    };
+}

package/dist/esm/repository.js

@@ -1,22 +1,22 @@
-export function Repository(repoOrTeam, name) {
-    if (name) {
-        return `${repoOrTeam}/${name}`;
-    }
-    else if (repoOrTeam.indexOf("/") > 0) {
-        return repoOrTeam;
-    }
-    else {
-        throw new TypeError("Invalid repository format");
-    }
-}
-(function (Repository) {
-    function split(repo) {
-        const parts = repo.split("/");
-        return {
-            team: parts[0],
-            name: parts[1],
-        };
-    }
-    Repository.split = split;
-})(Repository || (Repository = {}));
+export function Repository(repoOrTeam, name) {
+    if (name) {
+        return `${repoOrTeam}/${name}`;
+    }
+    else if (repoOrTeam.indexOf("/") > 0) {
+        return repoOrTeam;
+    }
+    else {
+        throw new TypeError("Invalid repository format");
+    }
+}
+(function (Repository) {
+    function split(repo) {
+        const parts = repo.split("/");
+        return {
+            team: parts[0],
+            name: parts[1],
+        };
+    }
+    Repository.split = split;
+})(Repository || (Repository = {}));
 //# sourceMappingURL=repository.js.map

package/dist/esm/repository.spec.d.ts

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

package/dist/esm/repository.spec.js

@@ -1,19 +1,19 @@
-import { expect } from "chai";
-import { Repository } from "./repository";
-describe("ctor", () => {
-    it("creates", () => {
-        expect(Repository("gpkv", "gjoel")).to.equal("gpkv/gjoel");
-        expect(Repository("gpkv/gjoel")).to.equal("gpkv/gjoel");
-    });
-    it("throws if wrong format", () => {
-        expect(() => Repository("invalid")).to.throw();
-    });
-});
-describe("split", () => {
-    it("splits into correct parts", () => {
-        const { team, name } = Repository.split(Repository("gpkv", "gjoel"));
-        expect(team).to.equal("gpkv");
-        expect(name).to.equal("gjoel");
-    });
-});
+import { expect } from "chai";
+import { Repository } from "./repository";
+describe("ctor", () => {
+    it("creates", () => {
+        expect(Repository("gpkv", "gjoel")).to.equal("gpkv/gjoel");
+        expect(Repository("gpkv/gjoel")).to.equal("gpkv/gjoel");
+    });
+    it("throws if wrong format", () => {
+        expect(() => Repository("invalid")).to.throw();
+    });
+});
+describe("split", () => {
+    it("splits into correct parts", () => {
+        const { team, name } = Repository.split(Repository("gpkv", "gjoel"));
+        expect(team).to.equal("gpkv");
+        expect(name).to.equal("gjoel");
+    });
+});
 //# sourceMappingURL=repository.spec.js.map

package/dist/esm/step.d.ts

@@ -1,15 +1,15 @@
-import { DateTime, Duration } from "luxon";
-export type Step = "hour" | "day" | "week" | "month" | "year";
-export declare enum DayOfWeek {
-    Monday = 1,
-    Tuesday = 2,
-    Wednesday = 3,
-    Thursday = 4,
-    Friday = 5,
-    Saturday = 6,
-    Sunday = 7
-}
-export declare namespace Step {
-    function startOf(dateTime: DateTime, step: Step, firstDayOfWeek?: DayOfWeek): DateTime;
-    function asDuration(step: Step, amount?: number): Duration;
-}
+import { DateTime, Duration } from "luxon";
+export type Step = "hour" | "day" | "week" | "month" | "year";
+export declare enum DayOfWeek {
+    Monday = 1,
+    Tuesday = 2,
+    Wednesday = 3,
+    Thursday = 4,
+    Friday = 5,
+    Saturday = 6,
+    Sunday = 7
+}
+export declare namespace Step {
+    function startOf(dateTime: DateTime, step: Step, firstDayOfWeek?: DayOfWeek): DateTime;
+    function asDuration(step: Step, amount?: number): Duration;
+}

package/dist/esm/step.js

@@ -1,38 +1,38 @@
-import { Duration } from "luxon";
-export var DayOfWeek;
-(function (DayOfWeek) {
-    DayOfWeek[DayOfWeek["Monday"] = 1] = "Monday";
-    DayOfWeek[DayOfWeek["Tuesday"] = 2] = "Tuesday";
-    DayOfWeek[DayOfWeek["Wednesday"] = 3] = "Wednesday";
-    DayOfWeek[DayOfWeek["Thursday"] = 4] = "Thursday";
-    DayOfWeek[DayOfWeek["Friday"] = 5] = "Friday";
-    DayOfWeek[DayOfWeek["Saturday"] = 6] = "Saturday";
-    DayOfWeek[DayOfWeek["Sunday"] = 7] = "Sunday";
-})(DayOfWeek || (DayOfWeek = {}));
-;
-export var Step;
-(function (Step) {
-    function startOf(dateTime, step, firstDayOfWeek) {
-        if (step === "week") {
-            const value = dateTime.startOf("day").set({ weekday: firstDayOfWeek !== null && firstDayOfWeek !== void 0 ? firstDayOfWeek : DayOfWeek.Monday });
-            return value > dateTime
-                ? value.minus({ days: 7 })
-                : value;
-        }
-        else {
-            return dateTime.startOf(step);
-        }
-    }
-    Step.startOf = startOf;
-    function asDuration(step, amount = 1) {
-        switch (step) {
-            case "hour": return Duration.fromObject({ hours: amount });
-            case "day": return Duration.fromObject({ days: amount });
-            case "week": return Duration.fromObject({ days: 7 * amount });
-            case "month": return Duration.fromObject({ months: amount });
-            case "year": return Duration.fromObject({ years: amount });
-        }
-    }
-    Step.asDuration = asDuration;
-})(Step || (Step = {}));
+import { Duration } from "luxon";
+export var DayOfWeek;
+(function (DayOfWeek) {
+    DayOfWeek[DayOfWeek["Monday"] = 1] = "Monday";
+    DayOfWeek[DayOfWeek["Tuesday"] = 2] = "Tuesday";
+    DayOfWeek[DayOfWeek["Wednesday"] = 3] = "Wednesday";
+    DayOfWeek[DayOfWeek["Thursday"] = 4] = "Thursday";
+    DayOfWeek[DayOfWeek["Friday"] = 5] = "Friday";
+    DayOfWeek[DayOfWeek["Saturday"] = 6] = "Saturday";
+    DayOfWeek[DayOfWeek["Sunday"] = 7] = "Sunday";
+})(DayOfWeek || (DayOfWeek = {}));
+;
+export var Step;
+(function (Step) {
+    function startOf(dateTime, step, firstDayOfWeek) {
+        if (step === "week") {
+            const value = dateTime.startOf("day").set({ weekday: firstDayOfWeek !== null && firstDayOfWeek !== void 0 ? firstDayOfWeek : DayOfWeek.Monday });
+            return value > dateTime
+                ? value.minus({ days: 7 })
+                : value;
+        }
+        else {
+            return dateTime.startOf(step);
+        }
+    }
+    Step.startOf = startOf;
+    function asDuration(step, amount = 1) {
+        switch (step) {
+            case "hour": return Duration.fromObject({ hours: amount });
+            case "day": return Duration.fromObject({ days: amount });
+            case "week": return Duration.fromObject({ days: 7 * amount });
+            case "month": return Duration.fromObject({ months: amount });
+            case "year": return Duration.fromObject({ years: amount });
+        }
+    }
+    Step.asDuration = asDuration;
+})(Step || (Step = {}));
 //# sourceMappingURL=step.js.map

package/dist/esm/step.spec.d.ts

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

package/dist/esm/step.spec.js

@@ -1,27 +1,27 @@
-import { expect } from "chai";
-import { DateTime } from "luxon";
-import { DayOfWeek, Step } from "./step";
-describe("startOf", () => {
-    it("returns start of day", () => {
-        const dt = DateTime.fromISO("2020-01-11T05:00:00+01:00");
-        const result = Step.startOf(dt, "day");
-        expect(+result).to.equal(+DateTime.fromISO("2020-01-11T00:00:00+01:00"));
-    });
-    it("returns previous monday from saturday", () => {
-        const dt = DateTime.fromISO("2020-01-11T05:00:00+01:00");
-        const result = Step.startOf(dt, "week", DayOfWeek.Monday);
-        expect(+result).to.equal(+DateTime.fromISO("2020-01-06T00:00:00+01:00"));
-    });
-    it("returns same monday from monday with hour", () => {
-        const dt = DateTime.fromISO("2020-01-13T05:00:00+01:00");
-        const result = Step.startOf(dt, "week", DayOfWeek.Monday);
-        expect(+result).to.equal(+DateTime.fromISO("2020-01-13T00:00:00+01:00"));
-    });
-});
-describe("asDuration", () => {
-    it("should return equivalent duration", () => {
-        const duration = Step.asDuration("week");
-        expect(duration.days).to.equal(7);
-    });
-});
+import { expect } from "chai";
+import { DateTime } from "luxon";
+import { DayOfWeek, Step } from "./step";
+describe("startOf", () => {
+    it("returns start of day", () => {
+        const dt = DateTime.fromISO("2020-01-11T05:00:00+01:00");
+        const result = Step.startOf(dt, "day");
+        expect(+result).to.equal(+DateTime.fromISO("2020-01-11T00:00:00+01:00"));
+    });
+    it("returns previous monday from saturday", () => {
+        const dt = DateTime.fromISO("2020-01-11T05:00:00+01:00");
+        const result = Step.startOf(dt, "week", DayOfWeek.Monday);
+        expect(+result).to.equal(+DateTime.fromISO("2020-01-06T00:00:00+01:00"));
+    });
+    it("returns same monday from monday with hour", () => {
+        const dt = DateTime.fromISO("2020-01-13T05:00:00+01:00");
+        const result = Step.startOf(dt, "week", DayOfWeek.Monday);
+        expect(+result).to.equal(+DateTime.fromISO("2020-01-13T00:00:00+01:00"));
+    });
+});
+describe("asDuration", () => {
+    it("should return equivalent duration", () => {
+        const duration = Step.asDuration("week");
+        expect(duration.days).to.equal(7);
+    });
+});
 //# sourceMappingURL=step.spec.js.map

package/dist/esm/time-or-rule.d.ts

@@ -1,7 +1,7 @@
-import { DateTime } from "luxon";
-export type TimeOrRule = Date | DateTime | string;
-export declare namespace TimeOrRule {
-    function isTime(input: TimeOrRule): input is Date | DateTime;
-    function isRule(input: TimeOrRule): input is string;
-    function asJSON(input: TimeOrRule): string;
-}
+import { DateTime } from "luxon";
+export type TimeOrRule = Date | DateTime | string;
+export declare namespace TimeOrRule {
+    function isTime(input: TimeOrRule): input is Date | DateTime;
+    function isRule(input: TimeOrRule): input is string;
+    function asJSON(input: TimeOrRule): string | null;
+}

package/dist/esm/time-or-rule.js

@@ -1,16 +1,16 @@
-export var TimeOrRule;
-(function (TimeOrRule) {
-    function isTime(input) {
-        return typeof input !== "string";
-    }
-    TimeOrRule.isTime = isTime;
-    function isRule(input) {
-        return typeof input === "string";
-    }
-    TimeOrRule.isRule = isRule;
-    function asJSON(input) {
-        return isRule(input) ? input : input.toJSON();
-    }
-    TimeOrRule.asJSON = asJSON;
-})(TimeOrRule || (TimeOrRule = {}));
+export var TimeOrRule;
+(function (TimeOrRule) {
+    function isTime(input) {
+        return typeof input !== "string";
+    }
+    TimeOrRule.isTime = isTime;
+    function isRule(input) {
+        return typeof input === "string";
+    }
+    TimeOrRule.isRule = isRule;
+    function asJSON(input) {
+        return isRule(input) ? input : input.toJSON();
+    }
+    TimeOrRule.asJSON = asJSON;
+})(TimeOrRule || (TimeOrRule = {}));
 //# sourceMappingURL=time-or-rule.js.map

package/dist/esm/unit-id.d.ts

@@ -1,2 +1,2 @@
-export type UnitId = "unitless" | "milliWattHour" | "wattHour" | "kiloWattHour" | "megaWattHour" | "gigaWattHour" | "calorie" | "kiloCalorie" | "megaCalorie" | "joule" | "kiloJoule" | "megaJoule" | "gigaJoule" | "liter" | "cubicMeter" | "fluidOunce" | "gallon" | "gram" | "kiloGram" | "tonne" | "ounce" | "pound" | "ton" | "second" | "minute" | "hour" | "day" | "week" | "month" | "year" | "milliWatt" | "milliWatt2" | "watt" | "watt2" | "kiloWatt" | "kiloWatt2" | "megaWatt" | "megaWatt2" | "gigaWatt" | "gigaWatt2" | "joulesPerSecond" | "joulesPerSecond2" | "joulesPerMinute" | "joulesPerMinute2" | "joulesPerHour" | "joulesPerHour2" | "litersPerSecond" | "litersPerSecond2" | "litersPerMinute" | "litersPerMinute2" | "litersPerHour" | "litersPerHour2" | "cubicMetersPerSecond" | "cubicMetersPerSecond2" | "cubicMetersPerMinute" | "cubicMetersPerMinute2" | "cubicMetersPerHour" | "cubicMetersPerHour2" | "fluidOuncesPerSecond" | "fluidOuncesPerSecond2" | "fluidOuncesPerMinute" | "fluidOuncesPerMinute2" | "fluidOuncesPerHour" | "fluidOuncesPerHour2" | "gallonsPerSecond" | "gallonsPerSecond2" | "gallonsPerMinute" | "gallonsPerMinute2" | "gallonsPerHour" | "gallonsPerHour2" | "gramsPerSecond" | "gramsPerSecond2" | "gramsPerMinute" | "gramsPerMinute2" | "gramsPerHour" | "gramsPerHour2" | "kiloGramsPerSecond" | "kiloGramsPerSecond2" | "kiloGramsPerMinute" | "kiloGramsPerMinute2" | "kiloGramsPerHour" | "kiloGramsPerHour2" | "celcius" | "kelvin" | "fahrenheit" | "bar" | "bar2" | "pascal" | "pascal2" | "var" | "kiloVar" | "megaVar" | "varHour" | "kiloVarHour" | "megaVarHour" | "percentage" | "literCelcius" | "cubicMeterCelcius";
-export declare const energyUnits: UnitId[];
+export type UnitId = "unitless" | "milliWattHour" | "wattHour" | "kiloWattHour" | "megaWattHour" | "gigaWattHour" | "calorie" | "kiloCalorie" | "megaCalorie" | "joule" | "kiloJoule" | "megaJoule" | "gigaJoule" | "liter" | "cubicMeter" | "fluidOunce" | "gallon" | "gram" | "kiloGram" | "tonne" | "ounce" | "pound" | "ton" | "second" | "minute" | "hour" | "day" | "week" | "month" | "year" | "milliWatt" | "milliWatt2" | "watt" | "watt2" | "kiloWatt" | "kiloWatt2" | "megaWatt" | "megaWatt2" | "gigaWatt" | "gigaWatt2" | "joulesPerSecond" | "joulesPerSecond2" | "joulesPerMinute" | "joulesPerMinute2" | "joulesPerHour" | "joulesPerHour2" | "litersPerSecond" | "litersPerSecond2" | "litersPerMinute" | "litersPerMinute2" | "litersPerHour" | "litersPerHour2" | "cubicMetersPerSecond" | "cubicMetersPerSecond2" | "cubicMetersPerMinute" | "cubicMetersPerMinute2" | "cubicMetersPerHour" | "cubicMetersPerHour2" | "fluidOuncesPerSecond" | "fluidOuncesPerSecond2" | "fluidOuncesPerMinute" | "fluidOuncesPerMinute2" | "fluidOuncesPerHour" | "fluidOuncesPerHour2" | "gallonsPerSecond" | "gallonsPerSecond2" | "gallonsPerMinute" | "gallonsPerMinute2" | "gallonsPerHour" | "gallonsPerHour2" | "gramsPerSecond" | "gramsPerSecond2" | "gramsPerMinute" | "gramsPerMinute2" | "gramsPerHour" | "gramsPerHour2" | "kiloGramsPerSecond" | "kiloGramsPerSecond2" | "kiloGramsPerMinute" | "kiloGramsPerMinute2" | "kiloGramsPerHour" | "kiloGramsPerHour2" | "celcius" | "kelvin" | "fahrenheit" | "bar" | "bar2" | "pascal" | "pascal2" | "var" | "kiloVar" | "megaVar" | "varHour" | "kiloVarHour" | "megaVarHour" | "percentage" | "literCelcius" | "cubicMeterCelcius";
+export declare const energyUnits: UnitId[];

package/dist/esm/unit-id.js

@@ -1,11 +1,11 @@
-export const energyUnits = [
-    "milliWattHour",
-    "wattHour",
-    "kiloWattHour",
-    "megaWattHour",
-    "gigaWattHour",
-    "calorie",
-    "kiloCalorie",
-    "megaCalorie",
-];
+export const energyUnits = [
+    "milliWattHour",
+    "wattHour",
+    "kiloWattHour",
+    "megaWattHour",
+    "gigaWattHour",
+    "calorie",
+    "kiloCalorie",
+    "megaCalorie",
+];
 //# sourceMappingURL=unit-id.js.map

package/locales/da/registers.json

@@ -195,7 +195,7 @@
     "kamdaDeviceAddresses": ["Enhedsadresser", "Enhedsadresser (Kamstrup DA)"],
     "msisdnDeviceAddresses": ["Telefonnumre", "Telefonnumre"],
     "deviceRegisters": ["Enhedsregistre", "Enhedsregistre"],
-    "consumptionZone": ["Forbrugssted", "Forbrugssted"],
+    "place": ["Forbrugssted", "Forbrugssted"],
 
     "mBusFormatStringSignature": ["MBus Signatur", "MBus Signatur"],
     "deviceSoftwareVersion": ["Programversion", "Programversion"],
@@ -208,6 +208,7 @@
     "kamstrupModuleType": ["Kamstrup Modultype", "Kamstrup Modultype"],
 
     "diehlInfocodeType1": ["Diehl Infokode (type 1)", "Diehl Infokode (type 1)"],
+    "diehlInfocodeType2": ["Diehl Infokode (type 2)", "Diehl Infokode (type 2)"],
     "diehlInfocode": ["Diehl Infokode", "Diehl Infokode"],
 
     "landisGyrMBusStatusType1": ["Landis+Gyr M-Bus Status (type 1)", "Landis+Gyr M-Bus Status (type 1)"],

package/locales/en/registers.json

@@ -195,7 +195,7 @@
     "kamdaDeviceAddresses": ["Enhedsadresser", "Enhedsadresser (Kamstrup DA)"],
     "msisdnDeviceAddresses": ["Phone numbers", "Phone numbers"],
     "deviceRegisters": ["Device registers", "Device registers"],
-    "consumptionZone": ["Place", "Place"],
+    "place": ["Place", "Place"],
 
     "mBusFormatStringSignature": ["MBus Signature", "MBus Signature"],
     "deviceSoftwareVersion": ["Version", "Device Software Version"],
@@ -208,6 +208,7 @@
     "kamstrupModuleType": ["Kamstrup module type", "Kamstrup module type"],
 
     "diehlInfocodeType1": ["Diehl Infocode (type 1)", "Diehl Infocode (type 1)"],
+    "diehlInfocodeType2": ["Diehl Infocode (type 2)", "Diehl Infocode (type 2)"],
     "diehlInfocode": ["Diehl Infocode", "Diehl Infocode"],
 
     "landisGyrMBusStatusType1": ["Landis+Gyr M-Bus Status (type 1)", "Landis+Gyr M-Bus Status (type 1)"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utiliread/primitives",
-  "version": "1.0.0-70",
+  "version": "1.0.0-72",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
@@ -27,8 +27,8 @@
     "karma-typescript": "^5.5.1",
     "luxon": "^3.0.4",
     "mocha": "^10.0.0",
-    "rimraf": "^4.1.1",
-    "typescript": "^4.1.5"
+    "rimraf": "^5.0.1",
+    "typescript": "^5.1.6"
   },
   "peerDependencies": {
     "luxon": "^2.1.0 || ^3.0.0"

package/src/register-id.ts

@@ -278,7 +278,7 @@ export type RegisterId =
 
     "deviceRegisters" |
 
-    "consumptionZone" |
+    "place" |
 
     "mBusFormatStringSignature" |
     "deviceSoftwareVersion" |
@@ -291,6 +291,7 @@ export type RegisterId =
     "kamstrupModuleType" |
 
     "diehlInfocodeType1" |
+    "diehlInfocodeType2" |
     "diehlInfocode" |
 
     "landisGyrMBusStatusType1" |