@utiliread/primitives 1.0.0-124 → 1.0.0-126

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";

package/dist/types/medium.d.ts

@@ -1 +1,7 @@
 export type Medium = "none" | "heat" | "water" | "cooling" | "electricity" | "infrastructure" | "all";
+export declare namespace 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/dist/types/medium.spec.d.ts

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

package/dist/types/repository.d.ts

@@ -2,6 +2,7 @@ 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 isRepository(input: string): input is Repository;
     function split(repo: Repository): {
         team: string;
         name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utiliread/primitives",
-  "version": "1.0.0-124",
+  "version": "1.0.0-126",
   "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";
 

package/src/medium.spec.ts

@@ -0,0 +1,12 @@
+import { Medium } from "./medium";
+import { expect } from "chai";
+
+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(false);
+        expect(Medium.isMedium("notamedium")).to.equal(false);
+    });
+});

package/src/medium.ts

@@ -6,3 +6,42 @@ export type Medium =
     | "electricity"
     | "infrastructure"
     | "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 ALL_MEDIUMS: Medium[] = [
+            "heat",
+            "water",
+            "cooling",
+            "electricity",
+            "infrastructure",
+        ];
+        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")
+        );
+    }
+}

package/src/repository.spec.ts

@@ -11,6 +11,15 @@ describe("ctor", () => {
     });
 });
 
+describe("isRepository", () => {
+    it("should correctly determine if input is a Repository", () => {
+        expect(Repository.isRepository("some/test")).to.equal(true);
+        expect(Repository.isRepository("so-me/te-st")).to.equal(true);
+        expect(Repository.isRepository("NOT/REPO")).to.equal(false);
+        expect(Repository.isRepository("notarepo")).to.equal(false);
+    });
+});
+
 describe("split", () => {
     it("splits into correct parts", () => {
         const { team, name } = Repository.split(Repository("gpkv", "gjoel"));

package/src/repository.ts

@@ -4,16 +4,21 @@ export type Repository = "some/repo";
 export function Repository(repo: string): Repository;
 export function Repository(team: string, name: string): Repository;
 export function Repository(repoOrTeam: string, name?: string): Repository {
-    if (name) {
-        return <Repository>`${repoOrTeam}/${name}`;
-    } else if (repoOrTeam.indexOf("/") > 0) {
-        return <Repository>repoOrTeam;
-    } else {
+    const repo = name ? `${repoOrTeam}/${name}` : repoOrTeam;
+    if (!Repository.isRepository(repo)) {
         throw new TypeError("Invalid repository format");
     }
+    return repo;
 }
 
+const PART_REGEX = new RegExp(/[a-z][a-z0-9-]*/);
+
 export namespace Repository {
+    export function isRepository(input: string): input is Repository {
+        const parts = input.split("/");
+        return parts.length === 2 && !parts.some((x) => !PART_REGEX.test(x));
+    }
+
     export function split(repo: Repository) {
         const parts = repo.split("/");
         return {

package/asdasd/index.js

@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=index.js.map

package/asdasd/index.js.map

@@ -1 +0,0 @@
-{"mappings":"","sources":["src/registers/index.ts"],"sourcesContent":["export * from \"./acoustic-noise\";\nexport * from \"./ambient-temperature\";\nexport * from \"./consumer\";\nexport * from \"./cooling-energy-inlet\";\nexport * from \"./cooling-energy-outlet\";\nexport * from \"./cooling-energy\";\nexport * from \"./cooling\";\nexport * from \"./device-addresses-kamdraft\";\nexport * from \"./device-addresses-msisdn\";\nexport * from \"./device-addresses-tchlr\";\nexport * from \"./device-addresses-wmbus\";\nexport * from \"./device-date-time\";\nexport * from \"./device-date\";\nexport * from \"./device-nominal-diameter\";\nexport * from \"./device-permanent-volume-flow\";\nexport * from \"./device-registers\";\nexport * from \"./device-software-version\";\nexport * from \"./device-time\";\nexport * from \"./device\";\nexport * from \"./diehl-infocode\";\nexport * from \"./electrical-energy\";\nexport * from \"./energy-inlet\";\nexport * from \"./energy-outlet\";\nexport * from \"./error-operating-time\";\nexport * from \"./flow-temperature-aux\";\nexport * from \"./flow-temperature-inlet\";\nexport * from \"./flow-temperature-outlet\";\nexport * from \"./flow-temperature\";\nexport * from \"./heat-energy-inlet\";\nexport * from \"./heat-energy-outlet\";\nexport * from \"./heat-energy\";\nexport * from \"./infocode\";\nexport * from \"./kamstrup-module-type\";\nexport * from \"./kamstrup-multical-infocode\";\nexport * from \"./landis-gyr-infocode\";\nexport * from \"./landis-gyr-mbus-status\";\nexport * from \"./device-samples\";\nexport * from \"./mass-flow-inlet\";\nexport * from \"./mass-flow-outlet\";\nexport * from \"./mass-flow\";\nexport * from \"./mass-inlet\";\nexport * from \"./mass-outlet\";\nexport * from \"./mass\";\nexport * from \"./mbus-format-string-signature\";\nexport * from \"./none\";\nexport * from \"./operating-time\";\nexport * from \"./place\";\nexport * from \"./power-inlet\";\nexport * from \"./power-outlet\";\nexport * from \"./power\";\nexport * from \"./pressure-inlet\";\nexport * from \"./pressure-outlet\";\nexport * from \"./pressure\";\nexport * from \"./radiator-temperature\";\nexport * from \"./reactive-energy\";\nexport * from \"./relative-humidity\";\nexport * from \"./remaining-battery-time\";\nexport * from \"./time-last-exact-overhearing-arrived\";\nexport * from \"./time-last-installation-mounted\";\nexport * from \"./time-last-possible-candidate-overhearing-arrived\";\nexport * from \"./time-last-sampled\";\nexport * from \"./time\";\nexport * from \"./volume-flow-inlet\";\nexport * from \"./volume-flow-outlet\";\nexport * from \"./volume-flow\";\nexport * from \"./volume-inlet\";\nexport * from \"./volume-outlet\";\nexport * from \"./volume-pulse-input-a\";\nexport * from \"./volume-pulse-input-b\";\nexport * from \"./volume\";\n"],"names":[],"version":3,"file":"index.js.map"}