@utiliread/primitives 1.0.0-74 → 1.0.0-77

package/src/register-library.ts

@@ -3,13 +3,13 @@ import { RegisterId } from "./register-id";
 import { RegisterPack } from "./register-pack";
 
 class Library {
-    private definitions: Partial<{ [id in RegisterId]: RegisterDefinition }> = {};
+    private definitions: Partial<{ [id in RegisterId]: RegisterDefinition }> =
+        {};
     public add(...definitions: (RegisterDefinition | RegisterPack)[]) {
         for (const definition of definitions) {
             if (isDefinition(definition)) {
                 this.tryAdd(definition);
-            }
-            else {
+            } else {
                 for (const definitionInPack of Object.values(definition)) {
                     this.tryAdd(definitionInPack);
                 }
@@ -42,7 +42,7 @@ class Library {
     }
 
     public all() {
-        return Object.values(this.definitions).map(x => x!);
+        return Object.values(this.definitions).map((x) => x!);
     }
 
     public reset() {
@@ -50,8 +50,14 @@ class Library {
     }
 }
 
-function isDefinition(definitionOrPack: RegisterDefinition | RegisterPack): definitionOrPack is RegisterDefinition {
-    return !!(definitionOrPack.id && definitionOrPack.aggregate && definitionOrPack.units);
+function isDefinition(
+    definitionOrPack: RegisterDefinition | RegisterPack,
+): definitionOrPack is RegisterDefinition {
+    return !!(
+        definitionOrPack.id &&
+        definitionOrPack.aggregate &&
+        definitionOrPack.units
+    );
 }
 
-export const RegisterLibrary = new Library();
+export const RegisterLibrary = new Library();

package/src/register-pack.ts

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

package/src/register-utils.ts

@@ -3,4 +3,4 @@ import { RegisterId } from "./register-id";
 
 export function getRegisterId(register: RegisterId | RegisterDefinition) {
     return typeof register === "string" ? register : register.id;
-}
+}

package/src/repository.spec.ts

@@ -1,20 +1,20 @@
-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 { Repository } from "./repository";
+import { expect } from "@esm-bundle/chai";
+
+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");
+    });
+});

package/src/repository.ts

@@ -1,24 +1,24 @@
-// This is clearly not correct but it provides some amazing type safety
-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 {
-        throw new TypeError("Invalid repository format");
-    }
-}
-
-export namespace Repository {
-    export function split(repo: Repository) {
-        const parts = repo.split("/");
-        return {
-            team: parts[0],
-            name: parts[1],
-        };
-    }
-}
+// This is clearly not correct but it provides some amazing type safety
+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 {
+        throw new TypeError("Invalid repository format");
+    }
+}
+
+export namespace Repository {
+    export function split(repo: Repository) {
+        const parts = repo.split("/");
+        return {
+            team: parts[0],
+            name: parts[1],
+        };
+    }
+}

package/src/step.spec.ts

@@ -1,24 +1,31 @@
-import { expect } from "chai";
-import { DateTime } from "luxon";
 import { DayOfWeek, Step } from "./step";
 
+import { DateTime } from "luxon";
+import { expect } from "@esm-bundle/chai";
+
 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"));
+        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"));
+        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"));
+        expect(+result).to.equal(
+            +DateTime.fromISO("2020-01-13T00:00:00+01:00"),
+        );
     });
 });
 
@@ -27,4 +34,4 @@ describe("asDuration", () => {
         const duration = Step.asDuration("week");
         expect(duration.days).to.equal(7);
     });
-});
+});

package/src/step.ts

@@ -1,37 +1,45 @@
-import { DateTime, Duration } from "luxon";
-
-export type Step = "hour" | "day" | "week" | "month" | "year";
-
-export enum DayOfWeek {
-    Monday = 1,
-    Tuesday = 2,
-    Wednesday = 3,
-    Thursday = 4,
-    Friday = 5,
-    Saturday = 6,
-    Sunday = 7,
-};
-
-export namespace Step {
-    export function startOf(dateTime: DateTime, step: Step, firstDayOfWeek?: DayOfWeek): DateTime {
-        if (step === "week") {
-            const value = dateTime.startOf("day").set({ weekday: firstDayOfWeek ?? DayOfWeek.Monday });
-            return value > dateTime
-                ? value.minus({ days: 7 })
-                : value;
-        }
-        else {
-            return dateTime.startOf(step);
-        }
-    }
-
-    export function asDuration(step: Step, amount = 1): Duration {
-        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 });
-        }
-    }
-}
+import { DateTime, Duration } from "luxon";
+
+export type Step = "hour" | "day" | "week" | "month" | "year";
+
+export enum DayOfWeek {
+    Monday = 1,
+    Tuesday = 2,
+    Wednesday = 3,
+    Thursday = 4,
+    Friday = 5,
+    Saturday = 6,
+    Sunday = 7,
+}
+
+export namespace Step {
+    export function startOf(
+        dateTime: DateTime,
+        step: Step,
+        firstDayOfWeek?: DayOfWeek,
+    ): DateTime {
+        if (step === "week") {
+            const value = dateTime
+                .startOf("day")
+                .set({ weekday: firstDayOfWeek ?? DayOfWeek.Monday });
+            return value > dateTime ? value.minus({ days: 7 }) : value;
+        } else {
+            return dateTime.startOf(step);
+        }
+    }
+
+    export function asDuration(step: Step, amount = 1): Duration {
+        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 });
+        }
+    }
+}

package/src/time-or-rule.ts

@@ -1,17 +1,17 @@
-import { DateTime } from "luxon";
-
-export type TimeOrRule = Date | DateTime | string;
-
-export namespace TimeOrRule {
-    export function isTime(input: TimeOrRule): input is Date | DateTime {
-        return typeof input !== "string";
-    }
-
-    export function isRule(input: TimeOrRule): input is string {
-        return typeof input === "string";
-    }
-
-    export function asJSON(input: TimeOrRule) {
-        return isRule(input) ? input : input.toJSON();
-    }
-}
+import { DateTime } from "luxon";
+
+export type TimeOrRule = Date | DateTime | string;
+
+export namespace TimeOrRule {
+    export function isTime(input: TimeOrRule): input is Date | DateTime {
+        return typeof input !== "string";
+    }
+
+    export function isRule(input: TimeOrRule): input is string {
+        return typeof input === "string";
+    }
+
+    export function asJSON(input: TimeOrRule) {
+        return isRule(input) ? input : input.toJSON();
+    }
+}

package/src/unit-id.ts

@@ -1,123 +1,102 @@
 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";
+    | "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 const energyUnits: UnitId[] = [
     "milliWattHour",

package/tsconfig.json

@@ -3,6 +3,7 @@
     "target": "ES2018",
     "module": "ESNext",
     "moduleResolution": "Node",
+    "esModuleInterop": true,
     "declaration": true,
     "sourceMap": true,
     "experimentalDecorators": true,

package/web-test-runner.config.mjs

@@ -0,0 +1,7 @@
+import { esbuildPlugin } from "@web/dev-server-esbuild";
+
+export default {
+    nodeResolve: true,
+    files: ["src/**/*.spec.ts"],
+    plugins: [esbuildPlugin({ ts: true })],
+};

package/karma.config.js

@@ -1,32 +0,0 @@
-const tsconfig = require("./tsconfig.json");
-
-module.exports = function (config) {
-    config.set({
-        frameworks: ["mocha", "chai", "karma-typescript"],
-        files: ["src/**/*.ts"],
-        preprocessors: {
-            "src/**/*.ts": ["karma-typescript"],
-        },
-        reporters: ["progress", "karma-typescript"],
-        browsers: ["ChromeHeadless", "ChromeDebugging", "Chrome"],
-        customLaunchers: {
-            ChromeDebugging: {
-                base: "Chrome",
-                flags: ["--remote-debugging-port=9222"],
-            },
-        },
-        karmaTypescriptConfig: {
-            bundlerOptions: {
-                entrypoints: /\.spec\.ts$/,
-                sourceMap: tsconfig.compilerOptions.sourceMap,
-                acornOptions: {
-                    ecmaVersion: "latest",
-                },
-            },
-            coverageOptions: {
-                instrumentation: false,
-            },
-            tsconfig: "./tsconfig.cjs.json",
-        },
-    });
-};