@utiliread/primitives 1.0.0-125 → 1.0.0-127

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
+import "./medium";
 import "./repository";
 import type { Consumer, Device, DeviceSample, KamdraftDeviceAddress, MsisdnDeviceAddress, Place, TchlrDeviceAddress, WMBusDeviceAddress } from "./registers";
 import { Duration } from "./luxon-local";
@@ -9,7 +10,7 @@ export type { AggregateId } from "./aggregate-id";
 export type { BreakdownPeriod } from "./breakdown-rule";
 export { BreakdownRule } from "./breakdown-rule";
 export type { MeasureId } from "./measure-id";
-export type { Medium } from "./medium";
+export { Medium } from "./medium";
 export type { Optional } from "./optional";
 export { PrecisionNumber } from "./precision-number";
 export { RegisterConvention } from "./register-convention";

package/dist/types/medium.d.ts

@@ -1,4 +1,7 @@
 export type Medium = "none" | "heat" | "water" | "cooling" | "electricity" | "infrastructure" | "all";
 export declare namespace Medium {
-    function isMedium(input: string | string[]): input is Medium | Medium[];
+    function isMedium(input: string): input is Medium;
+    function isMedium(input: string[]): input is Medium[];
+    function isMeter(medium: Medium | Medium[]): boolean;
+    function isFlowMeter(medium: Medium | Medium[]): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utiliread/primitives",
-  "version": "1.0.0-125",
+  "version": "1.0.0-127",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/index.ts

@@ -1,4 +1,6 @@
-import "./repository"; // We need this to get the Repository namespace exported
+// We need these to get their namespaces exported
+import "./medium";
+import "./repository";
 
 import * as registers2 from "./registers";
 
@@ -28,7 +30,7 @@ export type { AggregateId } from "./aggregate-id";
 export type { BreakdownPeriod } from "./breakdown-rule";
 export { BreakdownRule } from "./breakdown-rule";
 export type { MeasureId } from "./measure-id";
-export type { Medium } from "./medium";
+export { Medium } from "./medium";
 export type { Optional } from "./optional";
 export { PrecisionNumber } from "./precision-number";
 export { RegisterConvention } from "./register-convention";

package/src/medium.spec.ts

@@ -5,8 +5,8 @@ describe("isMedium", () => {
     it("should correctly determine if input is a medium", () => {
         expect(Medium.isMedium("heat")).to.equal(true);
         expect(Medium.isMedium("water")).to.equal(true);
-        expect(Medium.isMedium("heat,water")).to.equal(true);
         expect(Medium.isMedium(["heat","water"])).to.equal(true);
+        expect(Medium.isMedium("heat,water")).to.equal(false);
         expect(Medium.isMedium("notamedium")).to.equal(false);
     });
 });

package/src/medium.ts

@@ -8,13 +8,14 @@ export type Medium =
     | "all";
 
 export namespace Medium {
+    export function isMedium(input: string): input is Medium;
+    export function isMedium(input: string[]): input is Medium[];
     export function isMedium(
         input: string | string[],
     ): input is Medium | Medium[] {
         if (input === "none" || input === "all") {
             return true;
         }
-        const parts = Array.isArray(input) ? input : input.split(",");
         const ALL_MEDIUMS: Medium[] = [
             "heat",
             "water",
@@ -22,6 +23,25 @@ export namespace Medium {
             "electricity",
             "infrastructure",
         ];
-        return !parts.some((x) => !ALL_MEDIUMS.includes(<Medium>x));
+        return Array.isArray(input)
+            ? !input.some((x) => !ALL_MEDIUMS.includes(<Medium>x))
+            : ALL_MEDIUMS.includes(<Medium>input);
+    }
+
+    export function isMeter(medium: Medium | Medium[]) {
+        return (
+            medium.includes("heat") ||
+            medium.includes("water") ||
+            medium.includes("cooling") ||
+            medium.includes("electricity")
+        );
+    }
+
+    export function isFlowMeter(medium: Medium | Medium[]) {
+        return (
+            medium.includes("heat") ||
+            medium.includes("water") ||
+            medium.includes("cooling")
+        );
     }
 }