@utiliread/primitives 1.0.0-102 → 1.0.0-104

package/src/breakdown-rule.ts

@@ -1,60 +1,58 @@
-import { TimeOrRule } from "./time-or-rule";
-
-export type BreakdownRule = string;
-export type BreakdownPeriod = "hour" | "day" | "week" | "month" | "year";
-
-interface BreakdownRuleInit {
-    origin: TimeOrRule;
-    count: number;
-    period: BreakdownPeriod;
-}
-
-export function BreakdownRule(init: BreakdownRuleInit): BreakdownRule;
-export function BreakdownRule(
-    origin: TimeOrRule,
-    count: number,
-    period: BreakdownPeriod,
-): BreakdownRule;
-export function BreakdownRule(...params: any[]): BreakdownRule {
-    let init: BreakdownRuleInit;
-    switch (params.length) {
-        case 1:
-            init = params[0];
-            break;
-        case 3:
-            init = {
-                origin: params[0],
-                count: params[1],
-                period: params[2],
-            };
-            break;
-        default:
-            throw new TypeError("Invalid breakdown rule format");
-    }
-    const periodName =
-        Math.abs(init.count) == 1 ? init.period : (init.period + "s");
-    return `${init.origin}/${init.count}${periodName}`;
-}
-
-export namespace BreakdownRule {
-    const regex = new RegExp(
-        "(.*)/([-+]?[0-9]+)(hour|day|week|month|year)s?",
-    );
-    export function split(rule: BreakdownRule) {
-        const match = regex.exec(rule);
-        if (!match) {
-            throw new Error("Invalid breakdown rule format");
-        }
-        const origin = match[1];
-        const count = parseInt(match[2]);
-        let period = match[3];
-        if (period.endsWith("s")) {
-            period = period.substring(0, period.length - 1);
-        }
-        return {
-            origin: TimeOrRule.parse(origin),
-            count,
-            period: period as BreakdownPeriod,
-        };
-    }
-}
+import { TimeOrRule } from "./time-or-rule";
+
+export type BreakdownRule = string;
+export type BreakdownPeriod = "hour" | "day" | "week" | "month" | "year";
+
+interface BreakdownRuleInit {
+    origin: TimeOrRule;
+    count: number;
+    period: BreakdownPeriod;
+}
+
+export function BreakdownRule(init: BreakdownRuleInit): BreakdownRule;
+export function BreakdownRule(
+    origin: TimeOrRule,
+    count: number,
+    period: BreakdownPeriod,
+): BreakdownRule;
+export function BreakdownRule(...params: any[]): BreakdownRule {
+    let init: BreakdownRuleInit;
+    switch (params.length) {
+        case 1:
+            init = params[0];
+            break;
+        case 3:
+            init = {
+                origin: params[0],
+                count: params[1],
+                period: params[2],
+            };
+            break;
+        default:
+            throw new TypeError("Invalid breakdown rule format");
+    }
+    const periodName =
+        Math.abs(init.count) == 1 ? init.period : init.period + "s";
+    return `${init.origin}/${init.count}${periodName}`;
+}
+
+export namespace BreakdownRule {
+    const regex = new RegExp("(.*)/([-+]?[0-9]+)(hour|day|week|month|year)s?");
+    export function split(rule: BreakdownRule) {
+        const match = regex.exec(rule);
+        if (!match) {
+            throw new Error("Invalid breakdown rule format");
+        }
+        const origin = match[1];
+        const count = parseInt(match[2]);
+        let period = match[3];
+        if (period.endsWith("s")) {
+            period = period.substring(0, period.length - 1);
+        }
+        return {
+            origin: TimeOrRule.parse(origin),
+            count,
+            period: period as BreakdownPeriod,
+        };
+    }
+}

package/src/measures/energy.ts

@@ -9,4 +9,5 @@ export const units: ReadonlyArray<UnitId> = [
     "calorie",
     "kiloCalorie",
     "megaCalorie",
+    "gigaCalorie",
 ];

package/src/measures/pressure.ts

@@ -2,4 +2,8 @@ import { UnitId } from "../unit-id";
 
 export const units: ReadonlyArray<UnitId> = ["bar", "pascal", "kiloPascal"];
 
-export const sqUnits: ReadonlyArray<UnitId> = ["bar2", "pascal2", "kiloPascal2"];
+export const sqUnits: ReadonlyArray<UnitId> = [
+    "bar2",
+    "pascal2",
+    "kiloPascal2",
+];