@oneuptime/common 14.0.3 → 14.0.6

package/build/dist/Utils/MetricUnitUtil.js

@@ -46,6 +46,60 @@ const byteUnits = [
         aliases: ["pb", "petabyte", "petabytes", "pby"],
         toCanonical: 1e15,
     },
+    /*
+     * Binary (IEC) byte units — powers of 1024, not 1000. OpenTelemetry
+     * spells them in UCUM ("KiBy", "MiBy"), and the vcenter receiver reports
+     * memory in them, so without these members a "MiBy" sample was in no
+     * family at all: it could not be converted into a "GB" threshold (the
+     * value passed through unchanged, about a thousand times off) and the
+     * notification formatter could not scale it ("1048576 MiB" instead of
+     * "1.1 TB").
+     *
+     * CONVERSION-ONLY, deliberately. The threshold and legend unit pickers
+     * (CriteriaFilter, MetricAlias) build their options from
+     * getCompatibleUnits, whose byte list is the six decimal units — a
+     * contract MetricUnitUtil.test pins. Listing five near-duplicates
+     * ("MB" next to "MiB") in every bytes dropdown would clutter it for
+     * every metric, while the conversions below are what actually fixes
+     * the numbers. So the pickers keep treating a native "MiBy" exactly as
+     * they did before (a single raw-unit option, free-text legend), and
+     * only convertToMetricUnit / getFamilyBaseUnit see these members.
+     */
+    {
+        value: "KiB",
+        label: "Kibibytes (KiB)",
+        aliases: ["kib", "kiby", "kibibyte", "kibibytes"],
+        toCanonical: 1024,
+        isConversionOnly: true,
+    },
+    {
+        value: "MiB",
+        label: "Mebibytes (MiB)",
+        aliases: ["mib", "miby", "mebibyte", "mebibytes"],
+        toCanonical: 1024 ** 2,
+        isConversionOnly: true,
+    },
+    {
+        value: "GiB",
+        label: "Gibibytes (GiB)",
+        aliases: ["gib", "giby", "gibibyte", "gibibytes"],
+        toCanonical: 1024 ** 3,
+        isConversionOnly: true,
+    },
+    {
+        value: "TiB",
+        label: "Tebibytes (TiB)",
+        aliases: ["tib", "tiby", "tebibyte", "tebibytes"],
+        toCanonical: 1024 ** 4,
+        isConversionOnly: true,
+    },
+    {
+        value: "PiB",
+        label: "Pebibytes (PiB)",
+        aliases: ["pib", "piby", "pebibyte", "pebibytes"],
+        toCanonical: 1024 ** 5,
+        isConversionOnly: true,
+    },
 ];
 const timeUnits = [
     {
@@ -148,18 +202,21 @@ const allFamilies = [
 function normalize(unit) {
     return unit.trim().toLowerCase();
 }
-function findDefinitionInFamily(unit, family) {
+function isInScope(definition, scope) {
+    return scope === "all" || !definition.isConversionOnly;
+}
+function findDefinitionInFamily(unit, family, scope) {
     const normalized = normalize(unit);
     return (family.find((u) => {
-        return u.aliases.includes(normalized);
+        return isInScope(u, scope) && u.aliases.includes(normalized);
     }) || null);
 }
-function findFamily(unit) {
+function findFamily(unit, scope) {
     if (!unit || !unit.trim()) {
         return null;
     }
     for (const family of allFamilies) {
-        if (findDefinitionInFamily(unit, family)) {
+        if (findDefinitionInFamily(unit, family, scope)) {
             return family;
         }
     }
@@ -176,11 +233,15 @@ export default class MetricUnitUtil {
         if (!metricUnit || !metricUnit.trim()) {
             return [];
         }
-        const family = findFamily(metricUnit);
+        const family = findFamily(metricUnit, "offered");
         if (!family) {
             return [{ value: metricUnit, label: metricUnit }];
         }
-        return family.map((u) => {
+        return family
+            .filter((u) => {
+            return isInScope(u, "offered");
+        })
+            .map((u) => {
             return { value: u.value, label: u.label };
         });
     }
@@ -199,11 +260,11 @@ export default class MetricUnitUtil {
         if (!metricUnit || !metricUnit.trim()) {
             return undefined;
         }
-        const family = findFamily(metricUnit);
+        const family = findFamily(metricUnit, "offered");
         if (!family) {
             return metricUnit;
         }
-        const def = findDefinitionInFamily(metricUnit, family);
+        const def = findDefinitionInFamily(metricUnit, family, "offered");
         if (family === percentUnits && (def === null || def === void 0 ? void 0 : def.value) === "1") {
             return "%";
         }
@@ -224,12 +285,12 @@ export default class MetricUnitUtil {
         if (normalize(fromUnit) === normalize(metricUnit)) {
             return value;
         }
-        const family = findFamily(metricUnit);
+        const family = findFamily(metricUnit, "all");
         if (!family) {
             return value;
         }
-        const fromDef = findDefinitionInFamily(fromUnit, family);
-        const metricDef = findDefinitionInFamily(metricUnit, family);
+        const fromDef = findDefinitionInFamily(fromUnit, family, "all");
+        const metricDef = findDefinitionInFamily(metricUnit, family, "all");
         if (!fromDef || !metricDef) {
             return value;
         }
@@ -256,7 +317,7 @@ export default class MetricUnitUtil {
         if (!metricUnit || !metricUnit.trim()) {
             return null;
         }
-        const family = findFamily(metricUnit);
+        const family = findFamily(metricUnit, "all");
         if (!family) {
             return null;
         }
@@ -269,12 +330,15 @@ export default class MetricUnitUtil {
      * Convenience: does the metric unit belong to a family we can offer
      * conversions for? When false, the UI should still render a dropdown,
      * but with just the raw unit.
+     *
+     * "Offer" is literal: a conversion-only unit ("MiBy") answers false, in
+     * step with getCompatibleUnits, which gives it no family list either.
      */
     static hasCompatibleUnitFamily(metricUnit) {
         if (!metricUnit || !metricUnit.trim()) {
             return false;
         }
-        return findFamily(metricUnit) !== null;
+        return findFamily(metricUnit, "offered") !== null;
     }
 }
 //# sourceMappingURL=MetricUnitUtil.js.map

package/build/dist/Utils/MetricUnitUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetricUnitUtil.js","sourceRoot":"","sources":["../../../Utils/MetricUnitUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MetricUnitUtil.js","sourceRoot":"","sources":["../../../Utils/MetricUnitUtil.ts"],"names":[],"mappings":"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"}

package/build/dist/Utils/Monitor/MetricValueFormatter.js

@@ -34,20 +34,28 @@ import ValueFormatter from "../ValueFormatter";
  *     sample arrive carrying the unit "GB", and ValueFormatter has a
  *     ladder for "bytes" but not for "GB" — so 2500 of them rendered
  *     "2.5K GB" instead of "2.5 TB". Anything in a MetricUnitUtil family
- *     is converted to that family's base before the ladder runs.
+ *     is converted to that family's base before the ladder runs. That
+ *     includes the binary (IEC) byte units the vcenter receiver reports
+ *     memory in: 2048 "MiBy" is restated as 2147483648 bytes and reads
+ *     "2.15 GB", where it used to read "2048 MiB" and, for a large host,
+ *     "1048576 MiB".
  *
  *  3. UNITS WORTH HIDING. OTel's dimensionless "1" and UCUM's
  *     annotation-only units ("{restarts}", "{packets}") are not
  *     dimensions, and printing them produces the "0.06 1" that
  *     CompareCriteria and MonitorCriteriaObservationBuilder each grew
- *     their own guard against. That rule lives here now.
+ *     their own guard against. That rule lives here now — with one
+ *     exception: braces around a REAL, scalable unit ("{KiBy/s}", which
+ *     the vcenter receiver uses for throughput) are unwrapped rather than
+ *     hidden, because the value in them is a quantity, not a count.
  */
 class MetricValueFormatter {
     /**
      * Whether `unit` names a real dimension for `metricName` — i.e. whether
      * it is worth attaching to a number at all. False for the empty unit,
      * for the dimensionless "1" on a non-fraction metric, and for
-     * annotation-only units.
+     * annotation-only units. True for a braced unit whose inner text is a
+     * scalable unit ("{KiBy/s}"), which format() renders as that unit.
      */
     static hasDisplayableUnit(unit, metricName) {
         const trimmed = MetricValueFormatter.canonicalizeUnit(unit);
@@ -75,6 +83,8 @@ class MetricValueFormatter {
      *   format({ value: 1500, unit: "ms" })                  → "1.5 sec"
      *   format({ value: 3661, unit: "seconds" })             → "1.02 hours"
      *   format({ value: 1500000, unit: "By/s" })             → "1.5 MB/s"
+     *   format({ value: 2048, unit: "MiBy" })                → "2.15 GB"
+     *   format({ value: 2500000, unit: "{KiBy/s}" })         → "2.56 GB/s"
      *   format({ value: 0.2534, unit: "1",
      *            metricName: "system.cpu.utilization" })     → "25.34%"
      *   format({ value: 87.5, unit: "%" })                   → "87.50%"
@@ -86,6 +96,7 @@ class MetricValueFormatter {
      * A value with no dimension to report is left bare:
      *   format({ value: 1500 })                              → "1500"
      *   format({ value: 1500, unit: "{restarts}" })          → "1500"
+     *   format({ value: 1500, unit: "{errors/s}" })          → "1500"
      *   format({ value: 3.14159 })                           → "3.14"
      */
     static format(input) {
@@ -127,7 +138,7 @@ class MetricValueFormatter {
          * becomes "m per s2" and "10*3/uL" becomes "10*3 per uL", both longer
          * and less recognisable than what the exporter wrote. getCompactUnit
          * keeps the slash and still expands what is worth expanding
-         * ("Cel" → "°C", "KiBy" → "KiB").
+         * ("Cel" → "°C").
          */
         const unitSymbol = ValueFormatter.getCompactUnit(unit, formatOptions) || unit;
         return `${MetricValueFormatter.formatBareNumber(input.value)} ${unitSymbol}`;
@@ -146,19 +157,43 @@ class MetricValueFormatter {
         return readable.trim() ? readable : null;
     }
     /*
-     * Trim the unit and rewrite the catalogs' English spellings of "no
-     * dimension" into the UCUM ones the rest of the pipeline understands.
-     * Anything else is returned untouched — including its casing, which
-     * matters because an unrecognised unit is echoed verbatim next to the
-     * value ("5 widgets", not "5 Widgets").
+     * Trim the unit, unwrap a braced scalable unit ("{KiBy/s}" → "KiBy/s"),
+     * and rewrite the catalogs' English spellings of "no dimension" into the
+     * UCUM ones the rest of the pipeline understands. Anything else is
+     * returned untouched — including its casing, which matters because an
+     * unrecognised unit is echoed verbatim next to the value ("5 widgets",
+     * not "5 Widgets").
      */
     static canonicalizeUnit(unit) {
         const trimmed = (unit || "").trim();
         if (!trimmed) {
             return "";
         }
-        const alias = MetricValueFormatter.informalUnitAliases[trimmed.toLowerCase()];
-        return alias === undefined ? trimmed : alias;
+        const unwrapped = MetricValueFormatter.unwrapScalableAnnotation(trimmed);
+        const alias = MetricValueFormatter.informalUnitAliases[unwrapped.toLowerCase()];
+        return alias === undefined ? unwrapped : alias;
+    }
+    /*
+     * The vcenter receiver declares its throughput metrics as "{KiBy/s}":
+     * UCUM annotation braces around what is, in fact, a real unit. The
+     * annotation rule used to hide it, so 2500000 of them — about 2.56 GB/s
+     * of disk traffic — reached the inbox as a bare "2500000".
+     *
+     * So a braced unit is unwrapped when, and only when, its inner text is
+     * something this formatter can SCALE: a unit with a ladder, a member of
+     * a MetricUnitUtil family whose base has one ("KiBy", "GB", "min"), or
+     * a rate whose numerator is one of those ("KiBy/s", "By/s"). Every
+     * genuine annotation stays hidden exactly as before — "{restarts}",
+     * "{cpu}", "{packets/s}" and "{errors/s}" name no unit a ladder knows,
+     * so they keep rendering as the bare count.
+     */
+    static unwrapScalableAnnotation(unit) {
+        const match = unit.match(MetricValueFormatter.bracedUnitPattern);
+        const inner = ((match === null || match === void 0 ? void 0 : match[1]) || "").trim();
+        if (!inner) {
+            return unit;
+        }
+        return MetricValueFormatter.toScalableUnit(1, inner) ? inner : unit;
     }
     /**
      * Whether this metric's value is a point in time rather than a quantity,
@@ -179,8 +214,9 @@ class MetricValueFormatter {
      *   - it already has one ("bytes", "ms", "s", "ns");
      *   - it is a rate whose NUMERATOR does ("By/s" → scale the bytes, keep
      *     the "/s"), which is how 1500000 By/s reads "1.5 MB/s";
-     *   - it is a prefixed member of a MetricUnitUtil family ("GB", "hours"),
-     *     in which case the value is converted into that family's base first.
+     *   - it is a prefixed member of a MetricUnitUtil family ("GB", "hours",
+     *     and the binary "MiBy" / "KiBy"), in which case the value is
+     *     converted into that family's base first.
      */
     static toScalableUnit(value, unit) {
         if (!unit) {
@@ -235,8 +271,17 @@ class MetricValueFormatter {
  * UCUM annotation-only units — "{thread}", "{packets}", "{errors}".
  * The braces describe what is being counted; the value is a plain
  * count and the text inside them is not a unit a reader should see.
+ *
+ * Only reached for braces whose inner text is NOT itself a scalable
+ * unit: canonicalizeUnit has already unwrapped "{KiBy/s}" to "KiBy/s"
+ * (see unwrapScalableAnnotation), so what still matches here is a
+ * genuine annotation.
  */
 MetricValueFormatter.annotationOnlyUnitPattern = /^\{[^{}]*\}$/;
+/*
+ * The same shape, capturing the inner text.
+ */
+MetricValueFormatter.bracedUnitPattern = /^\{([^{}]*)\}$/;
 /*
  * The per-platform metric catalogs (Kubernetes, Ceph, Proxmox, Docker
  * Swarm) were written for humans reading a metric picker, so they spell

package/build/dist/Utils/Monitor/MetricValueFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetricValueFormatter.js","sourceRoot":"","sources":["../../../../Utils/Monitor/MetricValueFormatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MetricValueFormatter.js","sourceRoot":"","sources":["../../../../Utils/Monitor/MetricValueFormatter.ts"],"names":[],"mappings":"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"}

package/build/dist/Utils/Monitor/PlatformMetricUnitUtil.js

@@ -0,0 +1,161 @@
+import MonitorType from "../../Types/Monitor/MonitorType";
+import { getCephMetricByMetricName } from "../../Types/Monitor/CephMetricCatalog";
+import { getDockerMetricByMetricName } from "../../Types/Monitor/DockerMetricCatalog";
+import { getDockerSwarmMetricByMetricName } from "../../Types/Monitor/DockerSwarmMetricCatalog";
+import { getHostMetricByMetricName } from "../../Types/Monitor/HostMetricCatalog";
+import { getIoTMetricByMetricName } from "../../Types/Monitor/IotMetricCatalog";
+import { getKubernetesMetricByMetricName } from "../../Types/Monitor/KubernetesMetricCatalog";
+import { getPodmanMetricByMetricName } from "../../Types/Monitor/PodmanMetricCatalog";
+import { getProxmoxMetricByMetricName } from "../../Types/Monitor/ProxmoxMetricCatalog";
+import { getVMwareMetricByMetricName } from "../../Types/Monitor/VMwareMetricCatalog";
+/*
+ * What unit a platform monitor's metric values are in.
+ *
+ * Two sources can answer that, and they disagree often enough to matter:
+ *
+ *  - the unit the OpenTelemetry exporter DECLARED, stored on MetricType
+ *    (k8s.node.allocatable_memory → "By");
+ *  - the unit the platform's metric catalog SAYS the values are in
+ *    (KubernetesMetricCatalog, DockerMetricCatalog, ...).
+ *
+ * The catalog wins. It was written against what each agent actually sends,
+ * and the exporters are not always right about their own numbers:
+ * docker_stats declares container.cpu.utilization and
+ * container.memory.percent with the unit "1" but sends 0–100. Taking the
+ * declared "1" would render 85.3 as "8530.00%", and — worse — a threshold
+ * typed in "%" would convert every sample ×100 and fire forever. kubeletstats
+ * declares k8s.node.cpu.utilization as "1" but it is a cores gauge.
+ *
+ * The declared unit is the fallback for everything the catalog does not
+ * know, which is how k8s.node.allocatable_memory reads "258 GB" instead of
+ * "257760964608" even before it has a catalog entry.
+ */
+export default class PlatformMetricUnitUtil {
+    /**
+     * The catalog platform a monitor type reads its metrics from, or null for
+     * monitor types without one (generic Metrics monitors keep the exporter's
+     * declared unit).
+     */
+    static getPlatformForMonitorType(monitorType) {
+        switch (monitorType) {
+            case MonitorType.Kubernetes:
+                return "kubernetes";
+            case MonitorType.Proxmox:
+                return "proxmox";
+            case MonitorType.VMware:
+                return "vmware";
+            case MonitorType.DockerSwarm:
+                return "dockerSwarm";
+            case MonitorType.Ceph:
+                return "ceph";
+            case MonitorType.Docker:
+                return "docker";
+            case MonitorType.Podman:
+                return "podman";
+            case MonitorType.Host:
+                return "host";
+            case MonitorType.IoTDevice:
+                return "iot";
+            default:
+                return null;
+        }
+    }
+    /**
+     * The unit the platform's catalog declares for a metric, exactly as the
+     * catalog spells it ("bytes", "cores", "ratio", "count", "%"), or
+     * undefined when the catalog does not know the metric or gives it no
+     * unit.
+     */
+    static getCatalogUnit(input) {
+        const unit = PlatformMetricUnitUtil.lookupCatalogUnit(input.platform, input.metricName);
+        return unit && unit.trim() ? unit.trim() : undefined;
+    }
+    /**
+     * The unit a platform metric's values are in, spelled so the rest of the
+     * pipeline can convert it: the catalog unit when the catalog has a real
+     * one, else the exporter-declared unit, else undefined.
+     *
+     * The catalogs spell two dimensionless concepts in English. "ratio" (and
+     * "fraction") becomes UCUM's "1", which MetricUnitUtil can convert to a
+     * "%" threshold and MetricValueFormatter renders as a percentage.
+     * "count" names no dimension at all, so it defers to the declared unit
+     * ("{restart}", which renders bare the same way) instead of hiding it.
+     */
+    static getMetricUnit(input) {
+        const catalogUnit = input.platform
+            ? PlatformMetricUnitUtil.toConvertibleUnit(PlatformMetricUnitUtil.getCatalogUnit({
+                platform: input.platform,
+                metricName: input.metricName,
+            }))
+            : undefined;
+        if (catalogUnit) {
+            return catalogUnit;
+        }
+        const declaredUnit = (input.declaredUnit || "").trim();
+        return declaredUnit || undefined;
+    }
+    /**
+     * The unit map a platform monitor hands the criteria evaluator: one entry
+     * per metric name, keyed lowercased like MetricMonitorResponse's
+     * `nativeUnitsByMetricName`, holding getMetricUnit's answer. Metrics with
+     * no known unit are left out rather than mapped to "".
+     */
+    static buildUnitsByMetricName(input) {
+        const unitsByMetricName = {};
+        for (const metricName of input.metricNames) {
+            if (!metricName) {
+                continue;
+            }
+            const unit = PlatformMetricUnitUtil.getMetricUnit({
+                platform: input.platform,
+                metricName: metricName,
+                declaredUnit: input.declaredUnitsByMetricName.get(metricName.toLowerCase()),
+            });
+            if (unit) {
+                unitsByMetricName[metricName.toLowerCase()] = unit;
+            }
+        }
+        return unitsByMetricName;
+    }
+    static toConvertibleUnit(unit) {
+        if (!unit) {
+            return undefined;
+        }
+        switch (unit.toLowerCase()) {
+            case "ratio":
+            case "fraction":
+                return "1";
+            case "count":
+            case "counts":
+                return undefined;
+            default:
+                return unit;
+        }
+    }
+    static lookupCatalogUnit(platform, metricName) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        switch (platform) {
+            case "kubernetes":
+                return (_a = getKubernetesMetricByMetricName(metricName)) === null || _a === void 0 ? void 0 : _a.unit;
+            case "proxmox":
+                return (_b = getProxmoxMetricByMetricName(metricName)) === null || _b === void 0 ? void 0 : _b.unit;
+            case "vmware":
+                return (_c = getVMwareMetricByMetricName(metricName)) === null || _c === void 0 ? void 0 : _c.unit;
+            case "dockerSwarm":
+                return (_d = getDockerSwarmMetricByMetricName(metricName)) === null || _d === void 0 ? void 0 : _d.unit;
+            case "ceph":
+                return (_e = getCephMetricByMetricName(metricName)) === null || _e === void 0 ? void 0 : _e.unit;
+            case "docker":
+                return (_f = getDockerMetricByMetricName(metricName)) === null || _f === void 0 ? void 0 : _f.unit;
+            case "podman":
+                return (_g = getPodmanMetricByMetricName(metricName)) === null || _g === void 0 ? void 0 : _g.unit;
+            case "host":
+                return (_h = getHostMetricByMetricName(metricName)) === null || _h === void 0 ? void 0 : _h.unit;
+            case "iot":
+                return (_j = getIoTMetricByMetricName(metricName)) === null || _j === void 0 ? void 0 : _j.unit;
+            default:
+                return undefined;
+        }
+    }
+}
+//# sourceMappingURL=PlatformMetricUnitUtil.js.map

package/build/dist/Utils/Monitor/PlatformMetricUnitUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PlatformMetricUnitUtil.js","sourceRoot":"","sources":["../../../../Utils/Monitor/PlatformMetricUnitUtil.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gCAAgC,EAAE,MAAM,8CAA8C,CAAC;AAChG,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,+BAA+B,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAiBtF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC;;;;OAIG;IACI,MAAM,CAAC,yBAAyB,CACrC,WAAoC;QAEpC,QAAQ,WAAW,EAAE,CAAC;YACpB,KAAK,WAAW,CAAC,UAAU;gBACzB,OAAO,YAAY,CAAC;YACtB,KAAK,WAAW,CAAC,OAAO;gBACtB,OAAO,SAAS,CAAC;YACnB,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,QAAQ,CAAC;YAClB,KAAK,WAAW,CAAC,WAAW;gBAC1B,OAAO,aAAa,CAAC;YACvB,KAAK,WAAW,CAAC,IAAI;gBACnB,OAAO,MAAM,CAAC;YAChB,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,QAAQ,CAAC;YAClB,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,QAAQ,CAAC;YAClB,KAAK,WAAW,CAAC,IAAI;gBACnB,OAAO,MAAM,CAAC;YAChB,KAAK,WAAW,CAAC,SAAS;gBACxB,OAAO,KAAK,CAAC;YACf;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,cAAc,CAAC,KAG5B;QACC,MAAM,IAAI,GAAuB,sBAAsB,CAAC,iBAAiB,CACvE,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,UAAU,CACjB,CAAC;QAEF,OAAO,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,CAAC;IAED;;;;;;;;;;OAUG;IACI,MAAM,CAAC,aAAa,CAAC,KAI3B;QACC,MAAM,WAAW,GAAuB,KAAK,CAAC,QAAQ;YACpD,CAAC,CAAC,sBAAsB,CAAC,iBAAiB,CACtC,sBAAsB,CAAC,cAAc,CAAC;gBACpC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC,CACH;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,MAAM,YAAY,GAAW,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAE/D,OAAO,YAAY,IAAI,SAAS,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,sBAAsB,CAAC,KAIpC;QACC,MAAM,iBAAiB,GAAuB,EAAE,CAAC;QAEjD,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAuB,sBAAsB,CAAC,aAAa,CAAC;gBACpE,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,UAAU,EAAE,UAAU;gBACtB,YAAY,EAAE,KAAK,CAAC,yBAAyB,CAAC,GAAG,CAC/C,UAAU,CAAC,WAAW,EAAE,CACzB;aACF,CAAC,CAAC;YAEH,IAAI,IAAI,EAAE,CAAC;gBACT,iBAAiB,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC;YACrD,CAAC;QACH,CAAC;QAED,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAC9B,IAAwB;QAExB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,QAAQ,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YAC3B,KAAK,OAAO,CAAC;YACb,KAAK,UAAU;gBACb,OAAO,GAAG,CAAC;YACb,KAAK,OAAO,CAAC;YACb,KAAK,QAAQ;gBACX,OAAO,SAAS,CAAC;YACnB;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAC9B,QAA+B,EAC/B,UAAkB;;QAElB,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,YAAY;gBACf,OAAO,MAAA,+BAA+B,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YAC3D,KAAK,SAAS;gBACZ,OAAO,MAAA,4BAA4B,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YACxD,KAAK,QAAQ;gBACX,OAAO,MAAA,2BAA2B,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YACvD,KAAK,aAAa;gBAChB,OAAO,MAAA,gCAAgC,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YAC5D,KAAK,MAAM;gBACT,OAAO,MAAA,yBAAyB,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YACrD,KAAK,QAAQ;gBACX,OAAO,MAAA,2BAA2B,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YACvD,KAAK,QAAQ;gBACX,OAAO,MAAA,2BAA2B,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YACvD,KAAK,MAAM;gBACT,OAAO,MAAA,yBAAyB,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YACrD,KAAK,KAAK;gBACR,OAAO,MAAA,wBAAwB,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC;YACpD;gBACE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;CACF"}