@kosdev-code/kos-ui-sdk 0.1.0-dev.5784 → 0.1.0-dev.5789

package/index.js

@@ -1,7 +1,7 @@
 var rd = Object.defineProperty;
 var nd = (t, e, s) => e in t ? rd(t, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : t[e] = s;
 var l = (t, e, s) => (nd(t, typeof e != "symbol" ? e + "" : e, s), s);
-import C from "loglevel";
+import D from "loglevel";
 import { makeAutoObservable as xe, observable as se, makeObservable as Eo, action as Mo, createAtom as od, autorun as es, runInAction as X, observe as _a, isComputedProp as id, reaction as ts, when as qs, ObservableMap as _o, computed as Ta, isObservable as ad } from "mobx";
 import { makeAutoObservable as bS, makeObservable as vS } from "mobx";
 import { createMachine as $s, invoke as Ne, state as J, transition as P, action as K, interpret as Ss, immediate as Bt } from "robot3";
@@ -10,57 +10,57 @@ import { jsx as w, jsxs as Os, Fragment as ld } from "@emotion/react/jsx-runtime
 import To from "@emotion/styled";
 import { createPortal as $a } from "react-dom";
 import { keyframes as ud, css as Ft } from "@emotion/react";
-import St, { createContext as zs, useContext as wt, useState as E, useCallback as re, useMemo as Y, Suspense as dd, useEffect as S, useRef as bt, useReducer as hd } from "react";
+import St, { createContext as zs, useContext as wt, useState as E, useCallback as ne, useMemo as W, Suspense as dd, useEffect as S, useRef as bt, useReducer as hd } from "react";
 import { observer as Sa } from "mobx-react-lite";
 import { observer as ES } from "mobx-react-lite";
 import { useGesture as fd } from "@use-gesture/react";
 const $o = "method", pd = "topic", Ks = "url", nn = "request-id", So = "response-id", Oa = "status", it = "dst-addr", gd = "src-addr", Xe = "type", Ia = "ordered", Ca = "tracker", md = "Content-Type", yd = "Cache-Control", bd = "requestId", vd = process.env.KOS_LOGIN_URL || "http://localhost", wd = process.env.KOS_APP_PORT || "8080", d_ = `${vd}:${wd}`, Qn = "{MODEL_ID}";
 var on = /* @__PURE__ */ ((t) => (t.SEND = "/ws/log/msg/send", t.RECEIVED = "/ws/log/msg/receive", t))(on || {}), Ed = /* @__PURE__ */ ((t) => (t.MSG_RECEIVE = "/mock/msg/receive", t))(Ed || {});
 const Da = "/kos/model/ready/";
-C.info("Initializing event bus");
+D.info("Initializing event bus");
 globalThis.kos = globalThis.kos || {};
 globalThis.kos.subscriptions = globalThis.kos.subscriptions || {};
-const V = globalThis.kos.subscriptions, Md = () => Symbol("eventKey");
+const G = globalThis.kos.subscriptions, Md = () => Symbol("eventKey");
 function Oo(t) {
-  return V[t] && Object.getOwnPropertySymbols(V[t]).length > 0;
+  return G[t] && Object.getOwnPropertySymbols(G[t]).length > 0;
 }
 function O(t, e) {
   const s = Md();
-  return V[t] || (C.debug(`Initializing subscription for ${t}`), V[t] = {}), C.debug(`Subscribing to ${t} with id ${s.toString()}`), V[t][s] = e, {
-    count: V[t] ? Object.getOwnPropertySymbols(V[t]).length : 0,
-    unsubscribe: () => (C.debug(`Unsubscribing from ${t} with id ${s.toString()}`), V[t] && V[t][s] && delete V[t][s], V[t] && Object.getOwnPropertySymbols(V[t]).length === 0 && delete V[t], {
-      count: V[t] ? Object.getOwnPropertySymbols(V[t]).length : 0
+  return G[t] || (D.debug(`Initializing subscription for ${t}`), G[t] = {}), D.debug(`Subscribing to ${t} with id ${s.toString()}`), G[t][s] = e, {
+    count: G[t] ? Object.getOwnPropertySymbols(G[t]).length : 0,
+    unsubscribe: () => (D.debug(`Unsubscribing from ${t} with id ${s.toString()}`), G[t] && G[t][s] && delete G[t][s], G[t] && Object.getOwnPropertySymbols(G[t]).length === 0 && delete G[t], {
+      count: G[t] ? Object.getOwnPropertySymbols(G[t]).length : 0
     })
   };
 }
 function H(t, e, s = {}) {
-  if (!V[t] || Object.getOwnPropertySymbols(V[t]).length === 0)
-    return C.debug(`No subscriptions for ${t}. Not publishing.`), {
+  if (!G[t] || Object.getOwnPropertySymbols(G[t]).length === 0)
+    return D.debug(`No subscriptions for ${t}. Not publishing.`), {
       eventType: t,
       subscribers: 0
     };
-  const r = Object.getOwnPropertySymbols(V[t]).length;
-  return Object.getOwnPropertySymbols(V[t]).forEach((n) => {
+  const r = Object.getOwnPropertySymbols(G[t]).length;
+  return Object.getOwnPropertySymbols(G[t]).forEach((n) => {
     if (s.sync) {
       const o = s.sync;
-      C.debug(
+      D.debug(
         `Performing sync publish for ${t} with sync id ${o}`
-      ), V[t][n]({ body: e, headers: s }).then(
+      ), G[t][n]({ body: e, headers: s }).then(
         (i) => {
-          C.debug(
+          D.debug(
             `Response recieved for ${o}, publishing back to source.`
           ), H(o, i);
         }
       );
     } else
-      C.debug(`Performing async publish for ${t}`), V[t][n]({ body: e, headers: s });
+      D.debug(`Performing async publish for ${t}`), G[t][n]({ body: e, headers: s });
   }), {
     eventType: t,
     subscribers: r
   };
 }
 function _d() {
-  C.warn("Resetting event bus"), Object.keys(V).forEach((t) => delete V[t]);
+  D.warn("Resetting event bus"), Object.keys(G).forEach((t) => delete G[t]);
 }
 function xa(t, e) {
   const s = O(t, (r) => {
@@ -495,8 +495,8 @@ const Wa = Ya, xd = () => Wa.profiles || [], mi = (t) => xd().includes(t), b_ =
 }, Ad = () => {
   const t = we(), e = Pd(), r = t.kosLogLevel ?? e ?? window.kosLogLevel ?? process.env.KOS_LOG_LEVEL;
   return r || "WARN";
-}, Rd = () => window.kosMessageLogging || process.env.KOS_MESSAGE_LOGGING === "true", kd = () => window.kosMessageStudioLogging || process.env.KOS_MESSAGE_STUDIO_LOGGING === "true", Qa = "ws-log", Ld = C.methodFactory, Za = Rd(), Fd = kd();
-C.methodFactory = function(t, e, s) {
+}, Rd = () => window.kosMessageLogging || process.env.KOS_MESSAGE_LOGGING === "true", kd = () => window.kosMessageStudioLogging || process.env.KOS_MESSAGE_STUDIO_LOGGING === "true", Qa = "ws-log", Ld = D.methodFactory, Za = Rd(), Fd = kd();
+D.methodFactory = function(t, e, s) {
   const r = Ld(t, e, s);
   return function(...n) {
     var c;
@@ -507,16 +507,16 @@ C.methodFactory = function(t, e, s) {
   };
 };
 let Xa = Ad();
-C.setLevel(Xa);
+D.setLevel(Xa);
 window.setKosLogLevel = (t) => {
-  Xa = t, C.setLevel(t);
+  Xa = t, D.setLevel(t);
 };
-const Dr = C.getLogger(Qa);
+const Dr = D.getLogger(Qa);
 window.enableKosMessageLog = () => {
-  Dr.setLevel(C.levels.INFO);
+  Dr.setLevel(D.levels.INFO);
 };
 window.disableKosMessageLog = () => {
-  Dr.setLevel(C.levels.ERROR);
+  Dr.setLevel(D.levels.ERROR);
 };
 Za ? window.enableKosMessageLog() : window.disableKosMessageLog();
 const Nd = [
@@ -538,18 +538,18 @@ const Nd = [
   "box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 5px 3px -5px rgba(0, 0, 0, 0.5), 0 -13px 5px -10px rgba(255, 255, 255, 0.4) inset",
   "font-weight: bold"
 ].join(";"), tr = (t) => (e) => {
-  C.getLevel() <= t && e();
+  D.getLevel() <= t && e();
 }, g = {
-  ...C,
-  ifDebug: tr(C.levels.DEBUG),
-  ifInfo: tr(C.levels.INFO),
-  ifWarn: tr(C.levels.WARN),
-  ifError: tr(C.levels.ERROR),
-  getLogger: (t) => C.getLogger(`kos::${t}`),
-  getLoggers: () => C.getLoggers(),
+  ...D,
+  ifDebug: tr(D.levels.DEBUG),
+  ifInfo: tr(D.levels.INFO),
+  ifWarn: tr(D.levels.WARN),
+  ifError: tr(D.levels.ERROR),
+  getLogger: (t) => D.getLogger(`kos::${t}`),
+  getLoggers: () => D.getLoggers(),
   createLogger: ({ name: t, group: e }) => {
     var o, i, a, c;
-    const s = `${e ? `${e}:` : "kos"}::${t}`, r = C.getLogger(s);
+    const s = `${e ? `${e}:` : "kos"}::${t}`, r = D.getLogger(s);
     let n = (i = (o = globalThis.kos.logOverrides) == null ? void 0 : o.find(
       (u) => u.name === s
     )) == null ? void 0 : i.level;
@@ -565,7 +565,7 @@ const Nd = [
     const e = String(t).replace(/\n/g, "\\n");
     Dr.info(`%c⬇ ${e}`, Ud);
   }
-}, ne = Symbol("SubscriptionHandlers"), N = Symbol("DependencyModels"), mr = Symbol("FutureService"), vt = Symbol("ChildModels"), yr = Symbol("ParentModel"), br = Symbol("LogConfig"), On = Symbol("ReferenceConfig"), Ja = Symbol("KosModelSymbol"), st = Symbol("ModelEffects"), Et = Symbol("CompanionParentModel"), ec = Symbol("FutureContainerSetup"), tc = Symbol(
+}, oe = Symbol("SubscriptionHandlers"), N = Symbol("DependencyModels"), mr = Symbol("FutureService"), vt = Symbol("ChildModels"), yr = Symbol("ParentModel"), br = Symbol("LogConfig"), On = Symbol("ReferenceConfig"), Ja = Symbol("KosModelSymbol"), st = Symbol("ModelEffects"), Et = Symbol("CompanionParentModel"), ec = Symbol("FutureContainerSetup"), tc = Symbol(
   "MultipleFutureContainerSetup"
 ), vr = Symbol("FutureAliases"), sc = Symbol("TroubleAwareSetup"), rc = Symbol("LoggerSetup"), nc = Symbol("ContainerAwareSetup"), Vs = Symbol("StateMachineSetup"), Ms = Symbol("StateEntryHandlers"), wr = Symbol("StateExitHandlers"), v_ = Symbol("StateActionHandlers"), un = Symbol("OptionsRequired"), jd = Symbol("KosViewModelSymbol"), oc = Symbol("ViewModelConfig"), Bd = Symbol("ReloadAwareSetup"), xo = g.createLogger({ group: "decorators", name: "fsm-injection" });
 function ic(t) {
@@ -1039,24 +1039,24 @@ function at(t) {
               this,
               u,
               f
-            ), x = await bh(
+            ), C = await bh(
               m,
               p.method,
               y,
               v,
               _,
               U
-            ), [$, L] = x, Q = x[2];
+            ), [$, R] = C, V = C[2];
             if ($)
               return vh(
                 $,
-                L,
+                R,
                 p.errorHandler,
                 this,
-                Q
+                V
               );
-            let le = L;
-            return p.transform && (le = p.transform(L)), [null, le];
+            let re = R;
+            return p.transform && (re = p.transform(R)), [null, re];
           } catch (m) {
             return [m.message || "Unknown error", null];
           }
@@ -1923,7 +1923,7 @@ class Je {
     };
   }
 }
-var b = /* @__PURE__ */ ((t) => (t.CREATING = "creating", t.CREATED = "created", t.INITIALIZING = "initializing", t.INITIALIZED = "initialized", t.LOADING = "loading", t.LOADED = "loaded", t.ONLINE = "online", t.READYING = "readying", t.READY = "ready", t.READY_FAILED = "ready_failed", t.RESETTING = "resetting", t.RESET = "reset", t.OFFLINE = "offline", t.UNLOADING = "unloading", t.UNLOADED = "unloaded", t.FAILED = "failed", t.INACTIVE = "inactive", t.ACTIVE = "active", t.ACTIVATING = "activating", t.DEACTIVATING = "deactivating", t))(b || {}), k = /* @__PURE__ */ ((t) => (t.CREATE = "create", t.INITIALIZE = "init", t.LOAD = "load", t.READY = "ready", t.GO_ONLINE = "go_online", t.GO_OFFLINE = "go_offline", t.RESET = "go_offline", t.UNLOAD = "unload", t.FAILED = "failed", t.GO_ACTIVE = "go_active", t.GO_INACTIVE = "go_inactive", t.TIMEOUT = "timeout", t))(k || {});
+var b = /* @__PURE__ */ ((t) => (t.CREATING = "creating", t.CREATED = "created", t.INITIALIZING = "initializing", t.INITIALIZED = "initialized", t.LOADING = "loading", t.LOADED = "loaded", t.ONLINE = "online", t.READYING = "readying", t.READY = "ready", t.READY_FAILED = "ready_failed", t.RESETTING = "resetting", t.RESET = "reset", t.OFFLINE = "offline", t.UNLOADING = "unloading", t.UNLOADED = "unloaded", t.FAILED = "failed", t.INACTIVE = "inactive", t.ACTIVE = "active", t.ACTIVATING = "activating", t.DEACTIVATING = "deactivating", t))(b || {}), L = /* @__PURE__ */ ((t) => (t.CREATE = "create", t.INITIALIZE = "init", t.LOAD = "load", t.READY = "ready", t.GO_ONLINE = "go_online", t.GO_OFFLINE = "go_offline", t.RESET = "go_offline", t.UNLOAD = "unload", t.FAILED = "failed", t.GO_ACTIVE = "go_active", t.GO_INACTIVE = "go_inactive", t.TIMEOUT = "timeout", t))(L || {});
 const Se = async (t) => {
   if (t.id) {
     const e = T.getInstance().modelManager.getModelById(t.id);
@@ -1939,7 +1939,7 @@ const Se = async (t) => {
   if (await T.getInstance().whenReady(), !t.id)
     throw new Error("Model ID is required");
   const e = T.getInstance().modelManager.getModelById(t.id);
-  e && await e.fsm.transitionTo(k.UNLOAD, b.UNLOADED);
+  e && await e.fsm.transitionTo(L.UNLOAD, b.UNLOADED);
 }, N_ = async (t) => {
   await T.getInstance().whenReady(), await T.getInstance().modelManager.reloadModel(t), g.debug(
     `reload model initiated for model ${t.id}, model ready: ${Jn(t)} - ${Date.now()} `
@@ -2526,7 +2526,7 @@ function Kh(t, e) {
     "getCompanionParent"
     // Don't override our own getCompanionParent
   ], u = (p) => {
-    const m = i.constructor.prototype[ne] || {};
+    const m = i.constructor.prototype[oe] || {};
     return Object.values(m).some((y) => {
       const v = y == null ? void 0 : y.handler;
       return v === i[p] || v === i.constructor.prototype[p];
@@ -2597,11 +2597,11 @@ const Yh = {
     return Kh(a, r), Uh(a), Bh(a), Hh(a), qh(a), zh(a, s), ic(a), Vh(a), jh(a, s), Gh(a);
   }
 };
-function D(t) {
+function x(t) {
   return (e) => {
     var o, i;
     const s = e, r = typeof t == "string" ? { modelTypeId: t, autoRegister: !1 } : { autoRegister: !1, ...t };
-    s.prototype.modelTypeId = r.modelTypeId, s.prototype[Ja] = !0, (o = s.prototype)[ne] ?? (o[ne] = {}), (i = s.prototype)[N] ?? (i[N] = {}), r.optionsRequired && (s.prototype[un] = !0), g.ifDebug(() => {
+    s.prototype.modelTypeId = r.modelTypeId, s.prototype[Ja] = !0, (o = s.prototype)[oe] ?? (o[oe] = {}), (i = s.prototype)[N] ?? (i[N] = {}), r.optionsRequired && (s.prototype[un] = !0), g.ifDebug(() => {
       g.debug(`Registering model with id ${r.modelTypeId}`);
     });
     const n = new Proxy(s, Yh);
@@ -2637,13 +2637,13 @@ const K_ = ({
   websocket: s = !1,
   condition: r = () => !0
 }) => (n) => {
-  n[ne] = n[ne] || {}, Array.isArray(t) ? t.forEach((o) => {
-    n[ne][o] = {
+  n[oe] = n[oe] || {}, Array.isArray(t) ? t.forEach((o) => {
+    n[oe][o] = {
       websocket: s,
       handler: e,
       condition: r
     };
-  }) : n[ne][t] = {
+  }) : n[oe][t] = {
     websocket: s,
     handler: Wh(n, Mo(e), 200),
     condition: r
@@ -2671,8 +2671,8 @@ function q(t) {
 }
 function Xh(t, e) {
   const {
-    condition: s = (Q, le) => !0,
-    transform: r = (Q) => Q,
+    condition: s = (V, re) => !0,
+    transform: r = (V) => V,
     websocket: n = !1,
     fos: o = !1,
     bridge: i = !1,
@@ -2688,18 +2688,18 @@ function Xh(t, e) {
     wildcardName: v,
     flow: _,
     requiresBaseline: U
-  } = t, x = e.value, $ = Jh(x, {
+  } = t, C = e.value, $ = Jh(C, {
     debounce: h,
     throttle: f,
     buffer: p,
     once: y
-  }), L = ef(m, s);
+  }), R = ef(m, s);
   return {
     websocket: n,
     fos: o,
     bridge: i,
     handler: $,
-    condition: L,
+    condition: R,
     transform: r,
     lifecycle: c,
     skipParse: a,
@@ -2733,9 +2733,9 @@ function ef(t, e) {
   return t ? (s, r, n) => t(n) ? e(s, r, n) : !1 : e;
 }
 function tf(t, e, s) {
-  t[ne] = t[ne] || {}, Array.isArray(e) ? e.forEach((r) => {
-    t[ne][r] = s;
-  }) : t[ne][e] = s;
+  t[oe] = t[oe] || {}, Array.isArray(e) ? e.forEach((r) => {
+    t[oe][r] = s;
+  }) : t[oe][e] = s;
 }
 function sf(t, e) {
   df(t, e);
@@ -3202,7 +3202,7 @@ function Un(t) {
     }
   });
 }
-const pc = 5e3, If = (t) => t.fsm.transitionTo(k.GO_ACTIVE, b.ACTIVE), Cf = (t) => t.whenReady(), Df = (t) => t.fsm.transitionTo(k.LOAD, b.LOADED), xf = (t) => t.fsm.transitionTo(k.UNLOAD, b.UNLOADED), Pf = (t) => t.fsm.transitionTo(k.INITIALIZE, b.INITIALIZED);
+const pc = 5e3, If = (t) => t.fsm.transitionTo(L.GO_ACTIVE, b.ACTIVE), Cf = (t) => t.whenReady(), Df = (t) => t.fsm.transitionTo(L.LOAD, b.LOADED), xf = (t) => t.fsm.transitionTo(L.UNLOAD, b.UNLOADED), Pf = (t) => t.fsm.transitionTo(L.INITIALIZE, b.INITIALIZED);
 var gc = /* @__PURE__ */ ((t) => (t.ACTIVE = "active", t.READY = "ready", t.LOAD = "load", t.UNLOAD = "unload", t.INIT = "init", t))(gc || {});
 const jn = {
   active: If,
@@ -3582,7 +3582,7 @@ function jf(t, e, s, r) {
         },
         data: ((u = t.toJSON) == null ? void 0 : u.call(t)) || {},
         subscriptions: (() => {
-          const d = t[ne] || {}, h = Object.keys(d);
+          const d = t[oe] || {}, h = Object.keys(d);
           return h.length === 0 ? { count: 0, data: [] } : {
             count: h.length,
             data: h.map((f) => {
@@ -3712,10 +3712,10 @@ class qf {
 const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
   const e = $s(b.INACTIVE, {
     [b.FAILED]: J(
-      P(k.GO_ACTIVE, b.ACTIVATING)
+      P(L.GO_ACTIVE, b.ACTIVATING)
     ),
     [b.INACTIVE]: J(
-      P(k.GO_ACTIVE, b.ACTIVATING)
+      P(L.GO_ACTIVE, b.ACTIVATING)
     ),
     [b.ACTIVATING]: Ne(
       () => (t.activeStatus = b.ACTIVATING, t.activate()),
@@ -3735,7 +3735,7 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
       )
     ),
     [b.ACTIVE]: J(
-      P(k.GO_INACTIVE, b.DEACTIVATING)
+      P(L.GO_INACTIVE, b.DEACTIVATING)
     ),
     [b.DEACTIVATING]: Ne(
       () => (t.activeStatus = b.DEACTIVATING, t.deactivate()),
@@ -3763,7 +3763,7 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
   const e = $s(b.OFFLINE, {
     [b.ONLINE]: J(
       P(
-        k.GO_OFFLINE,
+        L.GO_OFFLINE,
         b.OFFLINE,
         K(async () => {
           await t.offline(), t.onlineStatus = b.OFFLINE;
@@ -3772,11 +3772,11 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
     ),
     [b.OFFLINE]: J(
       P(
-        k.GO_ONLINE,
+        L.GO_ONLINE,
         b.ONLINE,
         K(async () => {
           Ti.debug(`Going online with model ${t.modelId}`), await t.online(), t.onlineStatus = b.ONLINE, await t.fsm.transitionTo(
-            k.INITIALIZE,
+            L.INITIALIZE,
             b.INITIALIZED
           );
         })
@@ -3792,11 +3792,11 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
   const e = Kf(t).service, s = Vf(t).service;
   return $s(b.CREATING, {
     [b.CREATING]: J(
-      P(k.CREATE, b.CREATED)
+      P(L.CREATE, b.CREATED)
     ),
     [b.CREATED]: J(Bt(b.INITIALIZING)),
     [b.INITIALIZING]: Ne(
-      () => (ae(() => {
+      () => (ce(() => {
         t.status = b.INITIALIZING;
       }), t.init()),
       P(
@@ -3818,7 +3818,7 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
     ),
     [b.INITIALIZED]: J(Bt(b.LOADING)),
     [b.LOADING]: Ne(
-      () => (ae(() => {
+      () => (ce(() => {
         t.status = b.LOADING;
       }), t.load()),
       P(
@@ -3838,12 +3838,12 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
     ),
     [b.LOADED]: J(
       Bt(b.READYING),
-      P(k.UNLOAD, b.UNLOADING)
+      P(L.UNLOAD, b.UNLOADING)
     ),
     [b.RESETTING]: Ne(
       () => {
         var n;
-        return ae(() => {
+        return ce(() => {
           t.status = b.RESETTING;
         }), (n = t.unload) == null || n.call(t), t.load();
       },
@@ -3856,16 +3856,16 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
       )
     ),
     [b.READYING]: Ne(
-      () => (ae(() => {
+      () => (ce(() => {
         t.status = b.READYING;
       }), t.ready()),
       P(
         "done",
         b.READY,
         K(() => {
-          ae(() => {
+          ce(() => {
             t.status = b.READY;
-          }), s.send(k.GO_ONLINE);
+          }), s.send(L.GO_ONLINE);
         })
       ),
       P(
@@ -3878,37 +3878,37 @@ const zf = g.createLogger({ name: "model-active-machine" }), Kf = (t) => {
     ),
     [b.READY]: J(
       P(
-        k.UNLOAD,
+        L.UNLOAD,
         b.UNLOADED,
         K((r = t.unload) == null ? void 0 : r.bind(t))
       ),
-      P(k.RESET, b.RESETTING),
+      P(L.RESET, b.RESETTING),
       P(
-        k.GO_ONLINE,
+        L.GO_ONLINE,
         b.READY,
         K(() => {
-          s.send(k.GO_ONLINE);
+          s.send(L.GO_ONLINE);
         })
       ),
       P(
-        k.GO_OFFLINE,
+        L.GO_OFFLINE,
         b.READY,
         K(() => {
-          s.send(k.GO_OFFLINE);
+          s.send(L.GO_OFFLINE);
         })
       ),
       P(
-        k.GO_ACTIVE,
+        L.GO_ACTIVE,
         b.READY,
         K(() => {
-          e.send(k.GO_ACTIVE);
+          e.send(L.GO_ACTIVE);
         })
       ),
       P(
-        k.GO_INACTIVE,
+        L.GO_INACTIVE,
         b.READY,
         K(() => {
-          e.send(k.GO_INACTIVE);
+          e.send(L.GO_INACTIVE);
         })
       )
     ),
@@ -3927,7 +3927,7 @@ class Qf {
     l(this, "service");
     this.model = e, this.log = s;
     const r = Wf(e);
-    this.service = r.service, this.service.send(k.CREATE);
+    this.service = r.service, this.service.send(L.CREATE);
   }
   /**
    * Returns the current raw state of the FSM
@@ -4277,14 +4277,14 @@ class Xf {
       this.log.debug(
         `Online event received for ${e}, waiting for readiness...`
       ), await this.model.whenReady(), this.log.debug(`${e} is ready — sending GO_ONLINE`), await this.model.fsm.transitionTo(
-        k.GO_ONLINE,
+        L.GO_ONLINE,
         b.ONLINE
       );
     }), r = O("/kosCore/offline", async () => {
       this.log.debug(
         `Offline event received for ${e} — sending GO_OFFLINE`
       ), await this.model.fsm.transitionTo(
-        k.GO_OFFLINE,
+        L.GO_OFFLINE,
         b.OFFLINE
       );
     });
@@ -4673,25 +4673,25 @@ const up = ({
   return new Promise((p, m) => {
     let y = null;
     if (u.aborted) {
-      const x = u.reason;
-      (x == null ? void 0 : x.name) === "TimeoutError" ? lt.error(`Timeout occurred - url: ${t}`) : lt.debug(`Request aborted - url: ${t}`), m(x || new DOMException("Aborted", "AbortError"));
+      const C = u.reason;
+      (C == null ? void 0 : C.name) === "TimeoutError" ? lt.error(`Timeout occurred - url: ${t}`) : lt.debug(`Request aborted - url: ${t}`), m(C || new DOMException("Aborted", "AbortError"));
       return;
     }
     const v = () => {
       y && y();
-      const x = u.reason;
-      (x == null ? void 0 : x.name) === "TimeoutError" ? lt.error(`Timeout occurred - url: ${t}`) : lt.debug(`Request aborted - url: ${t}`), m(x || new DOMException("Aborted", "AbortError"));
+      const C = u.reason;
+      (C == null ? void 0 : C.name) === "TimeoutError" ? lt.error(`Timeout occurred - url: ${t}`) : lt.debug(`Request aborted - url: ${t}`), m(C || new DOMException("Aborted", "AbortError"));
     };
     u.addEventListener("abort", v, { once: !0 });
-    const _ = O(r, (x) => {
+    const _ = O(r, (C) => {
       u.removeEventListener("abort", v);
-      const $ = (x == null ? void 0 : x.headers) || {}, L = $["content-type"] || "text/plain", Q = $["content-encoding"], le = (x == null ? void 0 : x.body) || "";
-      let B = le;
-      if (Q === "base64" && le)
+      const $ = (C == null ? void 0 : C.headers) || {}, R = $["content-type"] || "text/plain", V = $["content-encoding"], re = (C == null ? void 0 : C.body) || "";
+      let B = re;
+      if (V === "base64" && re)
         try {
-          B = Jf(le);
-        } catch (ie) {
-          lt.error("Failed to decode base64 response", ie);
+          B = Jf(re);
+        } catch (ae) {
+          lt.error("Failed to decode base64 response", ae);
         }
       const ds = {
         headers: cp($),
@@ -4711,30 +4711,30 @@ const up = ({
         },
         text: async () => typeof B == "string" ? B : new TextDecoder().decode(B),
         arrayBuffer: async () => B instanceof ArrayBuffer ? B : new TextEncoder().encode(B).buffer,
-        blob: async () => B instanceof ArrayBuffer ? tp(B, L) : new Blob([B], { type: L }),
+        blob: async () => B instanceof ArrayBuffer ? tp(B, R) : new Blob([B], { type: R }),
         formData: async () => {
-          const ie = new FormData();
-          if (L === "multipart/form-data" && typeof B == "string")
+          const ae = new FormData();
+          if (R === "multipart/form-data" && typeof B == "string")
             try {
               const Re = JSON.parse(B);
               Re.fields && Object.entries(Re.fields).forEach(([pi, gi]) => {
-                ie.append(pi, gi);
+                ae.append(pi, gi);
               }), Re.files && lt.warn(
                 "File reconstruction in FormData not fully implemented"
               );
             } catch {
               throw new Error("Failed to parse FormData");
             }
-          return ie;
+          return ae;
         },
-        body: e != null && e.stream ? rp(async (ie) => {
+        body: e != null && e.stream ? rp(async (ae) => {
           if (B instanceof ArrayBuffer)
-            ie.enqueue(new Uint8Array(B));
+            ae.enqueue(new Uint8Array(B));
           else {
             const Re = new TextEncoder();
-            ie.enqueue(Re.encode(B));
+            ae.enqueue(Re.encode(B));
           }
-          ie.close();
+          ae.close();
         }) : lp(typeof B == "string" ? B : ""),
         redirected: !1,
         statusText: "",
@@ -5690,17 +5690,17 @@ class qp {
     l(this, "_onopen");
     l(this, "messageQueue", []);
     l(this, "isSending", !1);
-    C.debug(`called Bridge Transport with addr ${e}`);
+    D.debug(`called Bridge Transport with addr ${e}`);
     const s = this;
     globalThis.kosWindowWebsocketRecv = (r) => {
       if (s.onmessage) {
         const n = { data: r };
         s.onmessage(n);
       }
-    }, C.debug("Opening bridge transport"), globalThis.kosWindowWebsocketOpen(), C.debug("Opened bridge transport"), this._onclose = null, this._onerror = null, this._onmessage = null, this._onopen = null, this.addEventListener = () => C.debug("not implemented"), this.dispatchEvent = () => C.debug("not implemented"), this.removeEventListener = () => C.debug("not implemented");
+    }, D.debug("Opening bridge transport"), globalThis.kosWindowWebsocketOpen(), D.debug("Opened bridge transport"), this._onclose = null, this._onerror = null, this._onmessage = null, this._onopen = null, this.addEventListener = () => D.debug("not implemented"), this.dispatchEvent = () => D.debug("not implemented"), this.removeEventListener = () => D.debug("not implemented");
   }
   close() {
-    C.debug("closing");
+    D.debug("closing");
   }
   sendNextMessage() {
     if (this.messageQueue.length > 0) {
@@ -5824,7 +5824,7 @@ Gp.fos && (window.kosUseFos = !0);
 const Di = process.env.KOS_FOS_PORT;
 window.kosUseFos = !!(window.kosUseFos || process.env.KOS_USE_FOS === "true");
 window.kosFosPort = Di ? parseInt(Di) : 0;
-const ut = C.getLogger("web-socket-transport");
+const ut = D.getLogger("web-socket-transport");
 var Yp = /* @__PURE__ */ ((t) => (t.NOT_INITIALIZED = "not_initialized", t.INITIALIZED = "initialized", t.OFFLINE = "OFFLINE", t.ONLINE = "ONLINE", t))(Yp || {});
 class Cs {
   constructor({
@@ -5998,7 +5998,7 @@ class Wp {
   }
   registerAll(e) {
     var n;
-    const s = ((n = this.modelData) == null ? void 0 : n[ne]) || {}, r = Object.keys(s);
+    const s = ((n = this.modelData) == null ? void 0 : n[oe]) || {}, r = Object.keys(s);
     this.log.debug(
       `Found ${r.length} subscriptions in ${this.modelId} (lifecycle: ${e ?? "any"})`
     ), r.forEach((o) => {
@@ -6043,7 +6043,7 @@ class Wp {
         this.log.error("Error during subscription disposal", n);
       }
     this.activatableDisposers = [];
-    const e = ((s = this.modelData) == null ? void 0 : s[ne]) || {};
+    const e = ((s = this.modelData) == null ? void 0 : s[oe]) || {};
     for (const [r, n] of Object.entries(e))
       if (n.lifecycle === I.ACTIVATE) {
         const o = this.resolvePropKey(r);
@@ -6361,7 +6361,7 @@ function Qp(t) {
   return !!(t != null && t[st]) && Object.keys(t[st]).length > 0;
 }
 function Zp(t) {
-  return !!(t != null && t[ne]) && Object.keys(t[ne]).length > 0;
+  return !!(t != null && t[oe]) && Object.keys(t[oe]).length > 0;
 }
 function Xp(t) {
   return !!(t != null && t[rt]) && t[rt].length > 0;
@@ -6660,7 +6660,7 @@ class ng {
     )), h;
   }
 }
-const F = C.getLogger("kos-model"), og = "kos.extension.model.loader";
+const F = D.getLogger("kos-model"), og = "kos.extension.model.loader";
 class ig {
   constructor({ modelTypeName: e, id: s, modelData: r }) {
     l(this, "_id");
@@ -6872,7 +6872,7 @@ class ig {
         `Setting loaded context for ${r}, type: ${s}`
       ), d == null || d.set(h, f)), await ((n = this.serviceRequestManager) == null ? void 0 : n.executeForLifecycle(
         I.LOAD
-      )), await ((i = (o = this.modelData) == null ? void 0 : o.load) == null ? void 0 : i.call(o, d)), ae(() => {
+      )), await ((i = (o = this.modelData) == null ? void 0 : o.load) == null ? void 0 : i.call(o, d)), ce(() => {
         this.loaded = !0;
       }), F.debug(
         `Model ${s} with id ${r} successfully loaded`
@@ -7289,7 +7289,7 @@ class ug {
     if (e.id) {
       const s = this.getModelById(e.id);
       s && await s.fsm.transitionTo(
-        k.RESET,
+        L.RESET,
         b.RESETTING
       );
     }
@@ -7415,7 +7415,7 @@ const dg = (t) => {
     )
   }), s = Ss(
     e,
-    (o) => C.debug(o.machine.current)
+    (o) => D.debug(o.machine.current)
   ), r = $s({
     creating: J(
       P(
@@ -7515,7 +7515,7 @@ const dg = (t) => {
   });
   return { service: Ss(
     r,
-    (o) => C.debug(o.machine.current)
+    (o) => D.debug(o.machine.current)
   ), online: s };
 }, Z = g.createLogger({ name: "kos-core" }), hg = () => {
   const t = we(), e = t == null ? void 0 : t.alias, s = process.env.KOS_CONNECTION_ALIAS;
@@ -8182,9 +8182,9 @@ const Fg = g.createLogger({ name: "kos-service-request" }), _e = (t) => ({ isMoc
   } catch (m) {
     if (m instanceof DOMException) {
       if (m.name === "TimeoutError")
-        throw new G("Request timed out while deleting model");
+        throw new Y("Request timed out while deleting model");
       if (m.name === "AbortError")
-        throw new G("Request was cancelled while deleting model");
+        throw new Y("Request was cancelled while deleting model");
     }
     throw m;
   }
@@ -8227,7 +8227,7 @@ const Fg = g.createLogger({ name: "kos-service-request" }), _e = (t) => ({ isMoc
         y = await p.json();
       } catch {
       }
-      throw new G(
+      throw new Y(
         `There was a problem retrieving the model; returned status ${p.status}`,
         y ?? void 0
       );
@@ -8236,9 +8236,9 @@ const Fg = g.createLogger({ name: "kos-service-request" }), _e = (t) => ({ isMoc
   } catch (p) {
     if (p instanceof DOMException) {
       if (p.name === "TimeoutError")
-        throw new G("Request timed out while retrieving models");
+        throw new Y("Request timed out while retrieving models");
       if (p.name === "AbortError")
-        throw new G("Request was cancelled while retrieving models");
+        throw new Y("Request was cancelled while retrieving models");
     }
     throw p;
   }
@@ -8275,7 +8275,7 @@ const Fg = g.createLogger({ name: "kos-service-request" }), _e = (t) => ({ isMoc
         v = await m.json();
       } catch {
       }
-      throw new G(
+      throw new Y(
         `There was a problem retrieving the model; returned status ${m.status}`,
         v ?? void 0
       );
@@ -8284,9 +8284,9 @@ const Fg = g.createLogger({ name: "kos-service-request" }), _e = (t) => ({ isMoc
   } catch (m) {
     if (m instanceof DOMException) {
       if (m.name === "TimeoutError")
-        throw new G("Request timed out while retrieving model");
+        throw new Y("Request timed out while retrieving model");
       if (m.name === "AbortError")
-        throw new G("Request was cancelled while retrieving model");
+        throw new Y("Request was cancelled while retrieving model");
     }
     throw m;
   }
@@ -8322,7 +8322,7 @@ const Fg = g.createLogger({ name: "kos-service-request" }), _e = (t) => ({ isMoc
         v = await m.json();
       } catch {
       }
-      throw new G(
+      throw new Y(
         `There was a problem retrieving the model; returned status ${m.status}`,
         v ?? void 0
       );
@@ -8331,18 +8331,18 @@ const Fg = g.createLogger({ name: "kos-service-request" }), _e = (t) => ({ isMoc
   } catch (m) {
     if (m instanceof DOMException) {
       if (m.name === "TimeoutError")
-        throw new G(
+        throw new Y(
           "Request timed out while retrieving model by ID"
         );
       if (m.name === "AbortError")
-        throw new G(
+        throw new Y(
           "Request was cancelled while retrieving model by ID"
         );
     }
     throw m;
   }
 };
-class G extends Error {
+class Y extends Error {
   constructor(s, r) {
     super(s);
     l(this, "payload");
@@ -8382,7 +8382,7 @@ const Ni = (t, e, s) => async ({
         v = await m.json();
       } catch {
       }
-      throw new G(
+      throw new Y(
         `There was a problem sending the POST data; returned status ${m.status}`,
         v ?? void 0
       );
@@ -8391,9 +8391,9 @@ const Ni = (t, e, s) => async ({
   } catch (m) {
     if (m instanceof DOMException) {
       if (m.name === "TimeoutError")
-        throw new G("Request timed out while adding model");
+        throw new Y("Request timed out while adding model");
       if (m.name === "AbortError")
-        throw new G("Request was cancelled while adding model");
+        throw new Y("Request was cancelled while adding model");
     }
     throw m;
   }
@@ -8430,7 +8430,7 @@ const Ni = (t, e, s) => async ({
         _ = await y.json();
       } catch {
       }
-      throw new G(
+      throw new Y(
         `There was a problem modifying the model; returned status ${y.status}`,
         _ ?? void 0
       );
@@ -8439,9 +8439,9 @@ const Ni = (t, e, s) => async ({
   } catch (y) {
     if (y instanceof DOMException) {
       if (y.name === "TimeoutError")
-        throw new G("Request timed out while modifying model");
+        throw new Y("Request timed out while modifying model");
       if (y.name === "AbortError")
-        throw new G("Request was cancelled while modifying model");
+        throw new Y("Request was cancelled while modifying model");
     }
     throw y;
   }
@@ -8589,7 +8589,7 @@ function vT(t) {
 }
 const Hg = rs(), qg = () => `kos-${Hg}`, wT = (t) => !!t && !t.includes("VM_SERVICE") && t.startsWith(qg()), Oc = async (t, e = 6e4) => new Promise((s, r) => {
   const { unsubscribe: n } = O(t, (i) => {
-    C.debug(`recieved response for refId ${t}: ${i}`), n(), clearTimeout(o);
+    D.debug(`recieved response for refId ${t}: ${i}`), n(), clearTimeout(o);
     try {
       const a = i != null && i.body ? JSON.parse(i.body) : {};
       s(a);
@@ -8632,7 +8632,7 @@ class zg {
     this._id = e, this._context = new _o({}), this._parent = "", xe(this);
   }
   setParent(e) {
-    ae(() => {
+    ce(() => {
       this._parent = e;
     });
   }
@@ -9267,8 +9267,8 @@ async function DT() {
     return Ke.error("Failed to fetch started apps:", t), [];
   }
 }
-const ji = qs, Dc = Ta, ae = X, te = es, Yg = ts, xc = se, Pc = "Not Assigned", xT = "kos.trouble.added", PT = "kos.trouble.removed";
-var ce = /* @__PURE__ */ ((t) => (t.TroubleRank = "kos.trouble.rank.mapper", t.TroubleColor = "kos.trouble.color.mapper", t.TroubleRole = "kos.trouble.role.mapper", t.RegionServicePath = "kos.region.service_path.mapper", t.ConfigServicePath = "kos.config.service_path.mapper", t))(ce || {}), $r = /* @__PURE__ */ ((t) => (t.TIME_CHANGE = "/kos/internal/time/time", t.DAY_CHANGE = "/kos/internal/time/day", t.TIMEZONE_CHANGE = "/kos/internal/time/timezone", t))($r || {});
+const ji = qs, Dc = Ta, ce = X, te = es, Yg = ts, xc = se, Pc = "Not Assigned", xT = "kos.trouble.added", PT = "kos.trouble.removed";
+var le = /* @__PURE__ */ ((t) => (t.TroubleRank = "kos.trouble.rank.mapper", t.TroubleColor = "kos.trouble.color.mapper", t.TroubleRole = "kos.trouble.role.mapper", t.RegionServicePath = "kos.region.service_path.mapper", t.ConfigServicePath = "kos.config.service_path.mapper", t))(le || {}), $r = /* @__PURE__ */ ((t) => (t.TIME_CHANGE = "/kos/internal/time/time", t.DAY_CHANGE = "/kos/internal/time/day", t.TIMEZONE_CHANGE = "/kos/internal/time/timezone", t))($r || {});
 const Ac = g.createLogger({
   name: "config-bean-service",
   group: "Services"
@@ -9342,9 +9342,9 @@ function im(t, e) {
 const Ho = "config-bean-model", cr = g.getLogger(Ho), am = ss("path");
 function cm(t) {
   return M.propertyMapper.hasMapper(
-    ce.ConfigServicePath
+    le.ConfigServicePath
   ) ? M.propertyMapper.executeMapper(
-    ce.ConfigServicePath,
+    le.ConfigServicePath,
     t
   ) : "/api/kos/config";
 }
@@ -9418,7 +9418,7 @@ let Pr = class {
       const e = t.data;
       tm(e, this), cr.debug(this.values);
       const s = t == null ? void 0 : t.data.details[0].schema;
-      ae(() => {
+      ce(() => {
         s && (this._schema = s);
       });
     }
@@ -9499,7 +9499,7 @@ Lc([
   })
 ], Pr.prototype, "handleConfigBeanUpdated", 1);
 Pr = Lc([
-  D(Ho)
+  x(Ho)
 ], Pr);
 const Ar = new Pe({
   class: Pr,
@@ -9638,8 +9638,8 @@ var pm = Object.defineProperty, gm = Object.getOwnPropertyDescriptor, Ko = (t, e
 const Sr = "region-info-model", hs = g.createLogger({ name: "region-info-model" });
 function mm(t) {
   return M.propertyMapper.hasMapper(
-    ce.RegionServicePath
-  ) ? M.propertyMapper.executeMapper(ce.RegionServicePath, t) : "/api/kos/regions";
+    le.RegionServicePath
+  ) ? M.propertyMapper.executeMapper(le.RegionServicePath, t) : "/api/kos/regions";
 }
 let Ds = class {
   constructor(t) {
@@ -9940,7 +9940,7 @@ Ko([
   qo({ path: "kos:service:region" })
 ], Ds.prototype, "region", 2);
 Ds = Ko([
-  D(Sr)
+  x(Sr)
 ], Ds);
 const pe = {
   registration: {
@@ -10275,24 +10275,24 @@ let xs = class {
    * @returns Property value formatted with significant digits based on regional settings
    */
   get significantValue() {
-    var n, o;
+    var n, o, i;
     const t = this.value, e = this.regionInfo.defaultUnitSystem, s = this.getConverter(), r = (s == null ? void 0 : s.measure) || ((n = s == null ? void 0 : s.to) == null ? void 0 : n.measure);
     if (!isNaN(t) && s && r) {
-      const i = this.getDefaultUnitDecimalPlaces(
+      const a = this.getDefaultUnitDecimalPlaces(
         r,
-        e,
-        (o = s == null ? void 0 : s.to) == null ? void 0 : o.unit
+        ((o = s == null ? void 0 : s.to) == null ? void 0 : o.system) || e,
+        (i = s == null ? void 0 : s.to) == null ? void 0 : i.unit
       );
       try {
-        const c = this.getFormatterOptions(s);
-        if (c) {
-          let u = String(t);
-          return u = c.formatToParts(Number(t))[0].value, Number(u);
+        const u = this.getFormatterOptions(s);
+        if (u) {
+          let d = String(t);
+          return d = u.formatToParts(Number(t))[0].value, Number(d);
         }
-      } catch (c) {
-        Rt.info(`error formatting value ${t}`, c);
+      } catch (u) {
+        Rt.info(`error formatting value ${t}`, u);
       }
-      return Number(t).toFixed(i);
+      return Number(t).toFixed(a);
     }
     return t;
   }
@@ -10445,36 +10445,36 @@ let xs = class {
     return n;
   }
   getConverter() {
-    var r, n, o, i, a, c, u, d, h, f, p;
+    var r, n, o, i, a, c, u, d, h, f, p, m, y;
     const { unit: t, measure: e } = this.getConverterFromFormat(), s = t === "drt" ? "second" : t;
     if (this.converter) {
-      const m = (r = this.converter) == null ? void 0 : r.measure, y = (o = (n = this.converter) == null ? void 0 : n.to) == null ? void 0 : o.measure, v = (a = (i = this.converter) == null ? void 0 : i.from) == null ? void 0 : a.measure, _ = m || y || v || e, U = ((u = (c = this.converter) == null ? void 0 : c.to) == null ? void 0 : u.unit) || this.regionInfo.getDefaultUnitForMeasure(
-        _,
-        ((h = (d = this.converter) == null ? void 0 : d.to) == null ? void 0 : h.system) ?? this.regionInfo.defaultUnitSystem
-      ), x = ((p = (f = this.converter) == null ? void 0 : f.to) == null ? void 0 : p.system) ?? this.regionInfo.getUnitSystem(U), $ = this.schemaFormat === "drt" ? "second" : this.schemaFormat || s;
+      const v = (r = this.converter) == null ? void 0 : r.measure, _ = (o = (n = this.converter) == null ? void 0 : n.to) == null ? void 0 : o.measure, U = (a = (i = this.converter) == null ? void 0 : i.from) == null ? void 0 : a.measure, C = (u = (c = this.converter) == null ? void 0 : c.to) != null && u.unit ? this.regionInfo.getUnitMeasure(this.converter.to.unit) : void 0, $ = v || _ || U || C || e, R = ((h = (d = this.converter) == null ? void 0 : d.to) == null ? void 0 : h.unit) || this.regionInfo.getDefaultUnitForMeasure(
+        $,
+        ((p = (f = this.converter) == null ? void 0 : f.to) == null ? void 0 : p.system) ?? this.regionInfo.defaultUnitSystem
+      ), V = ((y = (m = this.converter) == null ? void 0 : m.to) == null ? void 0 : y.system) ?? this.regionInfo.getUnitSystem(R), re = this.schemaFormat === "drt" ? "second" : this.schemaFormat || s;
       return {
         ...this.converter,
         from: {
-          unit: $,
+          unit: re,
           ...this.converter.from
         },
         to: {
           ...this.converter.to,
-          unit: U,
-          system: x
+          unit: R,
+          system: V
         },
-        measure: _
+        measure: $
       };
     }
     if (s && e) {
-      const m = this.regionInfo.getDefaultUnitForMeasure(
+      const v = this.regionInfo.getDefaultUnitForMeasure(
         e,
         this.regionInfo.defaultUnitSystem
-      ), y = this.regionInfo.getUnitSystem(s), v = this.regionInfo.getUnitSystem(m);
+      ), _ = this.regionInfo.getUnitSystem(s), U = this.regionInfo.getUnitSystem(v);
       return {
         measure: e,
         to: {
-          unit: y === v ? s : m
+          unit: _ === U ? s : v
         }
       };
     }
@@ -10511,7 +10511,7 @@ Vo([
   qo({ path: Tm, serviceBasePath: $m })
 ], xs.prototype, "bean", 2);
 xs = Vo([
-  D(Or)
+  x(Or)
 ], xs);
 const os = {
   registration: {
@@ -10565,7 +10565,7 @@ const Bc = (t) => ({
 }), Hc = (t, e) => {
   g.debug(`future dto ${t.id} end state ${t.endState}`), g.debug(`future model ${e.id} end state ${e.endState}`), e.endState ? g.debug(`future model ${e.id} is already complete`) : (g.debug(`updating future model ${e.id}`), X(() => {
     const s = Bc(t);
-    ae(() => {
+    ce(() => {
       Object.keys(s).forEach((r) => {
         r === "id" ? (e.futureId = s.id, s.tracker || (e.id = s.id)) : r === "tracker" ? e.id = s.tracker : e[r] = s[r];
       });
@@ -10699,7 +10699,7 @@ zc([
   })
 ], kr.prototype, "handleRequest", 1);
 kr = zc([
-  D(Kc)
+  x(Kc)
 ], kr);
 const Vc = new Be({
   class: kr,
@@ -10831,7 +10831,7 @@ Gc([
   })
 ], Lr.prototype, "handleFutureUpdated", 1);
 Lr = Gc([
-  D(Xs.type)
+  x(Xs.type)
 ], Lr);
 const zm = Lr, Km = "future-container-model", _t = Qs(Km), Yc = (t) => qc(Xs)(t), Vm = (t) => {
   const e = Yc(t);
@@ -11005,7 +11005,7 @@ Go([
   })
 ], Ps.prototype, "handleFutureUpdated", 1);
 Ps = Go([
-  D(_t.type)
+  x(_t.type)
 ], Ps);
 const Qm = Ps, { URL: Js } = _e(), { getOne: Zm, postModel: Xm, deleteModel: Wc } = me.build({
   basePath: `${Js}/api/keyVal`
@@ -11115,17 +11115,17 @@ Yo([
   q({ topic: "/keyVal/remove" })
 ], As.prototype, "handleStateDelete", 1);
 As = Yo([
-  D(Jc)
+  x(Jc)
 ], As);
 const el = new Pe({
   class: As,
   type: Jc
 });
 var $e = "INUMBER", is = "IOP1", as = "IOP2", cs = "IOP3", We = "IVAR", Tt = "IVARNAME", Gt = "IFUNCALL", pn = "IFUNDEF", ge = "IEXPR", Wo = "IEXPREVAL", It = "IMEMBER", gn = "IENDSTATEMENT", Yt = "IARRAY";
-function R(t, e) {
+function k(t, e) {
   this.type = t, this.value = e ?? 0;
 }
-R.prototype.toString = function() {
+k.prototype.toString = function() {
   switch (this.type) {
     case $e:
     case is:
@@ -11148,35 +11148,35 @@ R.prototype.toString = function() {
   }
 };
 function mn(t) {
-  return new R(is, t);
+  return new k(is, t);
 }
 function et(t) {
-  return new R(as, t);
+  return new k(as, t);
 }
 function tl(t) {
-  return new R(cs, t);
+  return new k(cs, t);
 }
 function ro(t, e, s, r, n) {
   for (var o = [], i = [], a, c, u, d, h = 0; h < t.length; h++) {
     var f = t[h], p = f.type;
     if (p === $e || p === Tt)
       Array.isArray(f.value) ? o.push.apply(o, ro(f.value.map(function(m) {
-        return new R($e, m);
-      }).concat(new R(Yt, f.value.length)), e, s, r, n)) : o.push(f);
+        return new k($e, m);
+      }).concat(new k(Yt, f.value.length)), e, s, r, n)) : o.push(f);
     else if (p === We && n.hasOwnProperty(f.value))
-      f = new R($e, n[f.value]), o.push(f);
+      f = new k($e, n[f.value]), o.push(f);
     else if (p === as && o.length > 1)
-      c = o.pop(), a = o.pop(), d = s[f.value], f = new R($e, d(a.value, c.value)), o.push(f);
+      c = o.pop(), a = o.pop(), d = s[f.value], f = new k($e, d(a.value, c.value)), o.push(f);
     else if (p === cs && o.length > 2)
-      u = o.pop(), c = o.pop(), a = o.pop(), f.value === "?" ? o.push(a.value ? c.value : u.value) : (d = r[f.value], f = new R($e, d(a.value, c.value, u.value)), o.push(f));
+      u = o.pop(), c = o.pop(), a = o.pop(), f.value === "?" ? o.push(a.value ? c.value : u.value) : (d = r[f.value], f = new k($e, d(a.value, c.value, u.value)), o.push(f));
     else if (p === is && o.length > 0)
-      a = o.pop(), d = e[f.value], f = new R($e, d(a.value)), o.push(f);
+      a = o.pop(), d = e[f.value], f = new k($e, d(a.value)), o.push(f);
     else if (p === ge) {
       for (; o.length > 0; )
         i.push(o.shift());
-      i.push(new R(ge, ro(f.value, e, s, r, n)));
+      i.push(new k(ge, ro(f.value, e, s, r, n)));
     } else if (p === It && o.length > 0)
-      a = o.pop(), o.push(new R($e, a.value[f.value]));
+      a = o.pop(), o.push(new k($e, a.value[f.value]));
     else {
       for (; o.length > 0; )
         i.push(o.shift());
@@ -11193,10 +11193,10 @@ function sl(t, e, s) {
     if (i === We && o.value === e)
       for (var a = 0; a < s.tokens.length; a++) {
         var c = s.tokens[a], u;
-        c.type === is ? u = mn(c.value) : c.type === as ? u = et(c.value) : c.type === cs ? u = tl(c.value) : u = new R(c.type, c.value), r.push(u);
+        c.type === is ? u = mn(c.value) : c.type === as ? u = et(c.value) : c.type === cs ? u = tl(c.value) : u = new k(c.type, c.value), r.push(u);
       }
     else
-      i === ge ? r.push(new R(ge, sl(o.value, e, s))) : r.push(o);
+      i === ge ? r.push(new k(ge, sl(o.value, e, s))) : r.push(o);
   }
   return r;
 }
@@ -11237,15 +11237,15 @@ function gt(t, e, s) {
       r.push(function() {
         for (var y = r.pop(), v = [], _ = f.value; _-- > 0; )
           v.unshift(r.pop());
-        var U = r.pop(), x = function() {
-          for (var $ = Object.assign({}, s), L = 0, Q = v.length; L < Q; L++)
-            $[v[L]] = arguments[L];
+        var U = r.pop(), C = function() {
+          for (var $ = Object.assign({}, s), R = 0, V = v.length; R < V; R++)
+            $[v[R]] = arguments[R];
           return gt(y, e, $);
         };
-        return Object.defineProperty(x, "name", {
+        return Object.defineProperty(C, "name", {
           value: U,
           writable: !1
-        }), s[U] = x, x;
+        }), s[U] = C, C;
       }());
     else if (p === ge)
       r.push(sy(f, e));
@@ -11376,19 +11376,19 @@ function nl(t, e, s) {
 nl.prototype.toString = function() {
   return this.type + ": " + this.value;
 };
-function W(t, e) {
+function Q(t, e) {
   this.pos = 0, this.current = null, this.unaryOps = t.unaryOps, this.binaryOps = t.binaryOps, this.ternaryOps = t.ternaryOps, this.consts = t.consts, this.expression = e, this.savedPosition = 0, this.savedCurrent = null, this.options = t.options, this.parser = t;
 }
-W.prototype.newToken = function(t, e, s) {
+Q.prototype.newToken = function(t, e, s) {
   return new nl(t, e, s ?? this.pos);
 };
-W.prototype.save = function() {
+Q.prototype.save = function() {
   this.savedPosition = this.pos, this.savedCurrent = this.current;
 };
-W.prototype.restore = function() {
+Q.prototype.restore = function() {
   this.pos = this.savedPosition, this.current = this.savedCurrent;
 };
-W.prototype.next = function() {
+Q.prototype.next = function() {
   if (this.pos >= this.expression.length)
     return this.newToken(Rs, "EOF");
   if (this.isWhitespace() || this.isComment())
@@ -11397,7 +11397,7 @@ W.prototype.next = function() {
     return this.current;
   this.parseError('Unknown character "' + this.expression.charAt(this.pos) + '"');
 };
-W.prototype.isString = function() {
+Q.prototype.isString = function() {
   var t = !1, e = this.pos, s = this.expression.charAt(e);
   if (s === "'" || s === '"')
     for (var r = this.expression.indexOf(s, e + 1); r >= 0 && this.pos < this.expression.length; ) {
@@ -11410,23 +11410,23 @@ W.prototype.isString = function() {
     }
   return t;
 };
-W.prototype.isParen = function() {
+Q.prototype.isParen = function() {
   var t = this.expression.charAt(this.pos);
   return t === "(" || t === ")" ? (this.current = this.newToken(Qe, t), this.pos++, !0) : !1;
 };
-W.prototype.isBracket = function() {
+Q.prototype.isBracket = function() {
   var t = this.expression.charAt(this.pos);
   return (t === "[" || t === "]") && this.isOperatorEnabled("[") ? (this.current = this.newToken(Wt, t), this.pos++, !0) : !1;
 };
-W.prototype.isComma = function() {
+Q.prototype.isComma = function() {
   var t = this.expression.charAt(this.pos);
   return t === "," ? (this.current = this.newToken(bn, ","), this.pos++, !0) : !1;
 };
-W.prototype.isSemicolon = function() {
+Q.prototype.isSemicolon = function() {
   var t = this.expression.charAt(this.pos);
   return t === ";" ? (this.current = this.newToken(ei, ";"), this.pos++, !0) : !1;
 };
-W.prototype.isConst = function() {
+Q.prototype.isConst = function() {
   for (var t = this.pos, e = t; e < this.expression.length; e++) {
     var s = this.expression.charAt(e);
     if (s.toUpperCase() === s.toLowerCase() && (e === this.pos || s !== "_" && s !== "." && (s < "0" || s > "9")))
@@ -11439,7 +11439,7 @@ W.prototype.isConst = function() {
   }
   return !1;
 };
-W.prototype.isNamedOp = function() {
+Q.prototype.isNamedOp = function() {
   for (var t = this.pos, e = t; e < this.expression.length; e++) {
     var s = this.expression.charAt(e);
     if (s.toUpperCase() === s.toLowerCase() && (e === this.pos || s !== "_" && (s < "0" || s > "9")))
@@ -11452,7 +11452,7 @@ W.prototype.isNamedOp = function() {
   }
   return !1;
 };
-W.prototype.isName = function() {
+Q.prototype.isName = function() {
   for (var t = this.pos, e = t, s = !1; e < this.expression.length; e++) {
     var r = this.expression.charAt(e);
     if (r.toUpperCase() === r.toLowerCase()) {
@@ -11470,14 +11470,14 @@ W.prototype.isName = function() {
   }
   return !1;
 };
-W.prototype.isWhitespace = function() {
+Q.prototype.isWhitespace = function() {
   for (var t = !1, e = this.expression.charAt(this.pos); (e === " " || e === "	" || e === `
 ` || e === "\r") && (t = !0, this.pos++, !(this.pos >= this.expression.length)); )
     e = this.expression.charAt(this.pos);
   return t;
 };
 var ry = /^[0-9a-f]{4}$/i;
-W.prototype.unescape = function(t) {
+Q.prototype.unescape = function(t) {
   var e = t.indexOf("\\");
   if (e < 0)
     return t;
@@ -11525,11 +11525,11 @@ W.prototype.unescape = function(t) {
   }
   return s;
 };
-W.prototype.isComment = function() {
+Q.prototype.isComment = function() {
   var t = this.expression.charAt(this.pos);
   return t === "/" && this.expression.charAt(this.pos + 1) === "*" ? (this.pos = this.expression.indexOf("*/", this.pos) + 2, this.pos === 1 && (this.pos = this.expression.length), !0) : !1;
 };
-W.prototype.isRadixInteger = function() {
+Q.prototype.isRadixInteger = function() {
   var t = this.pos;
   if (t >= this.expression.length - 2 || this.expression.charAt(t) !== "0")
     return !1;
@@ -11550,7 +11550,7 @@ W.prototype.isRadixInteger = function() {
   }
   return r && (this.current = this.newToken(yn, parseInt(this.expression.substring(n, t), e)), this.pos = t), r;
 };
-W.prototype.isNumber = function() {
+Q.prototype.isNumber = function() {
   for (var t = !1, e = this.pos, s = e, r = e, n = !1, o = !1, i; e < this.expression.length && (i = this.expression.charAt(e), i >= "0" && i <= "9" || !n && i === "."); )
     i === "." ? n = !0 : o = !0, e++, t = o;
   if (t && (r = e), i === "e" || i === "E") {
@@ -11568,7 +11568,7 @@ W.prototype.isNumber = function() {
   }
   return t ? (this.current = this.newToken(yn, parseFloat(this.expression.substring(s, e))), this.pos = e) : this.pos = r, t;
 };
-W.prototype.isOperator = function() {
+Q.prototype.isOperator = function() {
   var t = this.pos, e = this.expression.charAt(this.pos);
   if (e === "+" || e === "-" || e === "*" || e === "/" || e === "%" || e === "^" || e === "?" || e === ":" || e === ".")
     this.current = this.newToken(j, e);
@@ -11591,10 +11591,10 @@ W.prototype.isOperator = function() {
     return !1;
   return this.pos++, this.isOperatorEnabled(this.current.value) ? !0 : (this.pos = t, !1);
 };
-W.prototype.isOperatorEnabled = function(t) {
+Q.prototype.isOperatorEnabled = function(t) {
   return this.parser.isOperatorEnabled(t);
 };
-W.prototype.getCoordinates = function() {
+Q.prototype.getCoordinates = function() {
   var t = 0, e, s = -1;
   do
     t++, e = this.pos - s, s = this.expression.indexOf(`
@@ -11605,7 +11605,7 @@ W.prototype.getCoordinates = function() {
     column: e
   };
 };
-W.prototype.parseError = function(t) {
+Q.prototype.parseError = function(t) {
   var e = this.getCoordinates();
   throw new Error("parse error [" + e.line + ":" + e.column + "]: " + t);
 };
@@ -11639,19 +11639,19 @@ z.prototype.parseAtom = function(t) {
     return n.value in e;
   }
   if (this.accept(Jo) || this.accept(j, s))
-    t.push(new R(We, this.current.value));
+    t.push(new k(We, this.current.value));
   else if (this.accept(yn))
-    t.push(new R($e, this.current.value));
+    t.push(new k($e, this.current.value));
   else if (this.accept(rl))
-    t.push(new R($e, this.current.value));
+    t.push(new k($e, this.current.value));
   else if (this.accept(Qe, "("))
     this.parseExpression(t), this.expect(Qe, ")");
   else if (this.accept(Wt, "["))
     if (this.accept(Wt, "]"))
-      t.push(new R(Yt, 0));
+      t.push(new k(Yt, 0));
     else {
       var r = this.parseArrayList(t);
-      t.push(new R(Yt, r));
+      t.push(new k(Yt, r));
     }
   else
     throw new Error("unexpected " + this.nextToken);
@@ -11665,7 +11665,7 @@ z.prototype.pushExpression = function(t, e) {
     t.push(e[s]);
 };
 z.prototype.parseUntilEndStatement = function(t, e) {
-  return this.accept(ei) ? (this.nextToken && this.nextToken.type !== Rs && !(this.nextToken.type === Qe && this.nextToken.value === ")") && e.push(new R(gn)), this.nextToken.type !== Rs && this.parseExpression(e), t.push(new R(ge, e)), !0) : !1;
+  return this.accept(ei) ? (this.nextToken && this.nextToken.type !== Rs && !(this.nextToken.type === Qe && this.nextToken.value === ")") && e.push(new k(gn)), this.nextToken.type !== Rs && this.parseExpression(e), t.push(new k(ge, e)), !0) : !1;
 };
 z.prototype.parseArrayList = function(t) {
   for (var e = 0; !this.accept(Wt, "]"); )
@@ -11681,32 +11681,32 @@ z.prototype.parseVariableAssignmentExpression = function(t) {
         throw new Error("function definition is not permitted");
       for (var n = 0, o = e.value + 1; n < o; n++) {
         var i = r - n;
-        t[i].type === We && (t[i] = new R(Tt, t[i].value));
+        t[i].type === We && (t[i] = new k(Tt, t[i].value));
       }
-      this.parseVariableAssignmentExpression(s), t.push(new R(ge, s)), t.push(new R(pn, e.value));
+      this.parseVariableAssignmentExpression(s), t.push(new k(ge, s)), t.push(new k(pn, e.value));
       continue;
     }
     if (e.type !== We && e.type !== It)
       throw new Error("expected variable for assignment");
-    this.parseVariableAssignmentExpression(s), t.push(new R(Tt, e.value)), t.push(new R(ge, s)), t.push(et("="));
+    this.parseVariableAssignmentExpression(s), t.push(new k(Tt, e.value)), t.push(new k(ge, s)), t.push(et("="));
   }
 };
 z.prototype.parseConditionalExpression = function(t) {
   for (this.parseOrExpression(t); this.accept(j, "?"); ) {
     var e = [], s = [];
-    this.parseConditionalExpression(e), this.expect(j, ":"), this.parseConditionalExpression(s), t.push(new R(ge, e)), t.push(new R(ge, s)), t.push(tl("?"));
+    this.parseConditionalExpression(e), this.expect(j, ":"), this.parseConditionalExpression(s), t.push(new k(ge, e)), t.push(new k(ge, s)), t.push(tl("?"));
   }
 };
 z.prototype.parseOrExpression = function(t) {
   for (this.parseAndExpression(t); this.accept(j, "or"); ) {
     var e = [];
-    this.parseAndExpression(e), t.push(new R(ge, e)), t.push(et("or"));
+    this.parseAndExpression(e), t.push(new k(ge, e)), t.push(et("or"));
   }
 };
 z.prototype.parseAndExpression = function(t) {
   for (this.parseComparison(t); this.accept(j, "and"); ) {
     var e = [];
-    this.parseComparison(e), t.push(new R(ge, e)), t.push(et("and"));
+    this.parseComparison(e), t.push(new k(ge, e)), t.push(et("and"));
   }
 };
 var ny = ["==", "!=", "<", "<=", ">=", ">", "in"];
@@ -11769,10 +11769,10 @@ z.prototype.parseFunctionCall = function(t) {
   } else
     for (this.parseMemberExpression(t); this.accept(Qe, "("); )
       if (this.accept(Qe, ")"))
-        t.push(new R(Gt, 0));
+        t.push(new k(Gt, 0));
       else {
         var n = this.parseArgumentList(t);
-        t.push(new R(Gt, n));
+        t.push(new k(Gt, n));
       }
 };
 z.prototype.parseArgumentList = function(t) {
@@ -11787,7 +11787,7 @@ z.prototype.parseMemberExpression = function(t) {
     if (e.value === ".") {
       if (!this.allowMemberAccess)
         throw new Error('unexpected ".", member access is not permitted');
-      this.expect(Jo), t.push(new R(It, this.current.value));
+      this.expect(Jo), t.push(new k(It, this.current.value));
     } else if (e.value === "[") {
       if (!this.tokens.isOperatorEnabled("["))
         throw new Error('unexpected "[]", arrays are disabled');
@@ -12086,7 +12086,7 @@ function Ct(t) {
 Ct.prototype.parse = function(t) {
   var e = [], s = new z(
     this,
-    new W(this, t),
+    new Q(this, t),
     { allowMemberAccess: this.options.allowMemberAccess }
   );
   return s.parseExpression(e), s.expect(Rs, "EOF"), new Ce(e, this);
@@ -12210,7 +12210,7 @@ let Fr = class {
    * ```
    */
   setContextData(t) {
-    this._data.setValues(t), ae(() => {
+    this._data.setValues(t), ce(() => {
       this._contextRevision++, this.logger.debug(
         "Context revision incremented to:",
         this._contextRevision
@@ -12393,7 +12393,7 @@ let Fr = class {
     this.logger.debug(
       `ExpressionEvaluator.updateResult called for "${t}":`,
       e
-    ), ae(() => {
+    ), ce(() => {
       this._results[t] = e;
     });
   }
@@ -12417,7 +12417,7 @@ let Fr = class {
 };
 tb(Fr, "Registration");
 Fr = eb([
-  D({ modelTypeId: sb, singleton: !1 })
+  x({ modelTypeId: sb, singleton: !1 })
 ], Fr);
 const nb = Fr.Registration, ob = g.createLogger({
   name: "kos-log-manager-service",
@@ -12586,7 +12586,7 @@ vn([
   })
 ], Qt.prototype, "handleOverrideRemoved", 1);
 Qt = vn([
-  D(al)
+  x(al)
 ], Qt);
 const hb = new Be({
   class: Qt,
@@ -12712,7 +12712,7 @@ wn([
   q({ topic: bb, websocket: !0 })
 ], Zt.prototype, "handleTimeZoneChange", 1);
 Zt = wn([
-  D(fs)
+  x(fs)
 ], Zt);
 const no = {
   registration: {
@@ -12768,7 +12768,7 @@ hl([
   Ue
 ], Nr.prototype, "_models", 2);
 Nr = hl([
-  D(fl)
+  x(fl)
 ], Nr);
 const Eb = g.createLogger({
   name: "log-stream-container-service",
@@ -12906,7 +12906,7 @@ let oo = class {
   }
 };
 oo = $b([
-  D(wl)
+  x(wl)
 ], oo);
 const Ur = new Pe({
   class: oo,
@@ -13084,7 +13084,7 @@ El([
   Ue
 ], jr.prototype, "_blocks", 2);
 jr = El([
-  D(Ml)
+  x(Ml)
 ], jr);
 const Ir = new Pe({
   class: jr,
@@ -13223,7 +13223,7 @@ Dt([
   })
 ], Ze.prototype, "handleLogLine", 1);
 Ze = Dt([
-  D(_l)
+  x(_l)
 ], Ze);
 const En = new Be({
   class: Ze,
@@ -13513,7 +13513,7 @@ Dl([
   di()
 ], Br.prototype, "resolve", 1);
 Br = Dl([
-  D(ps)
+  x(ps)
 ], Br);
 const Hr = {
   registration: {
@@ -13533,25 +13533,25 @@ var xl = Object.defineProperty, Gb = Object.getOwnPropertyDescriptor, Yb = (t, e
 }, Wb = (t, e, s) => (Yb(t, e + "", s), s);
 function Zi(t) {
   return M.propertyMapper.hasMapper(
-    ce.TroubleRank
+    le.TroubleRank
   ) ? M.propertyMapper.executeMapper(
-    ce.TroubleRank,
+    le.TroubleRank,
     t
   ) : Fb(t);
 }
 function Xi(t) {
   return (M.propertyMapper.hasMapper(
-    ce.TroubleColor
+    le.TroubleColor
   ) ? M.propertyMapper.executeMapper(
-    ce.TroubleColor,
+    le.TroubleColor,
     t
   ) : Nb(t)).toLowerCase();
 }
 function Ji(t) {
   return (M.propertyMapper.hasMapper(
-    ce.TroubleRole
+    le.TroubleRole
   ) ? M.propertyMapper.executeMapper(
-    ce.TroubleRole,
+    le.TroubleRole,
     t
   ) : Ub(t)).toLowerCase();
 }
@@ -13625,7 +13625,7 @@ Tn([
   q({ topic: "/kos/trouble/add", websocket: !0 })
 ], $t.prototype, "handleTroubleAdded", 1);
 $t = Tn([
-  D({ modelTypeId: Qb, singleton: !0 }),
+  x({ modelTypeId: Qb, singleton: !0 }),
   Gs(),
   dh(),
   Ao({
@@ -13809,7 +13809,7 @@ $n([
   })
 ], Xt.prototype, "handleChangedArtifacts", 1);
 Xt = $n([
-  D(Al)
+  x(Al)
 ], Xt);
 const ao = new Be({
   class: Xt,
@@ -13844,7 +13844,7 @@ const Rl = () => {
     destinationAddress: rv
   });
   if (!s)
-    throw t != null && t.aborted ? (Kn.debug("Request was aborted"), new G("Request was aborted")) : (Kn.error("Failed to fetch software-info", e), new G("Failed to fetch software-info"));
+    throw t != null && t.aborted ? (Kn.debug("Request was aborted"), new Y("Request was aborted")) : (Kn.error("Failed to fetch software-info", e), new Y("Failed to fetch software-info"));
   return s;
 }, nv = sv(ni), zT = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -13893,7 +13893,7 @@ let co = class {
     this.logger.debug(`loading software-info ${this.id}`);
     try {
       const t = await ni(), e = (t == null ? void 0 : t.nodes) || {};
-      ae(() => {
+      ce(() => {
         const r = Object.keys(e).map((n) => e[n][0]).map((n) => ({
           nodeName: n.nodeType,
           kosVersion: n.kosVersion,
@@ -13902,12 +13902,12 @@ let co = class {
         this.nodes = r;
       });
     } catch (t) {
-      t instanceof G && this.logger.error("Failed to fetch software-info", t);
+      t instanceof Y && this.logger.error("Failed to fetch software-info", t);
     }
   }
 };
 co = iv([
-  D(gs)
+  x(gs)
 ], co);
 const lo = {
   registration: {
@@ -13996,7 +13996,7 @@ Fl([
   })
 ], qr.prototype, "handleConfigBeanUpdated", 1);
 qr = Fl([
-  D(ms)
+  x(ms)
 ], qr);
 const zr = {
   registration: {
@@ -14062,7 +14062,7 @@ Nl([
   })
 ], Kr.prototype, "stateBean", 2);
 Kr = Nl([
-  D(ys)
+  x(ys)
 ], Kr);
 const Ul = {
   registration: {
@@ -14242,7 +14242,7 @@ let ho = class {
         return Promise.resolve({});
       }
     }), s = await Promise.allSettled(e);
-    ae(() => {
+    ce(() => {
       const r = s.reduce(
         (n, o, i) => (o.status === "fulfilled" ? (this.logger.debug(`resolved ${t[i]}`, o.value), o.value && (n = ql(n, o.value))) : this.logger.error(
           `failed to load translation ${this.id} for ${t[i]}`
@@ -14323,7 +14323,7 @@ let ho = class {
 };
 ho = Mv([
   Po(),
-  D(bs)
+  x(bs)
 ], ho);
 const fo = {
   registration: {
@@ -14411,7 +14411,7 @@ let Vr = class {
         descriptor: this.descriptor.namespaces[t].locales,
         resolver: this.resolver
       });
-      return this.addModel(o), this.namespaces.includes(t) || ae(() => {
+      return this.addModel(o), this.namespaces.includes(t) || ce(() => {
         this.namespaces.push(t);
       }), o;
     } else {
@@ -14454,7 +14454,7 @@ zl([
   Ue
 ], Vr.prototype, "_models", 2);
 Vr = zl([
-  D(vs)
+  x(vs)
 ], Vr);
 const nt = {
   registration: {
@@ -14544,7 +14544,7 @@ ii([
   })
 ], Fs.prototype, "handleReceiveEvent", 1);
 Fs = ii([
-  D(Kl.type)
+  x(Kl.type)
 ], Fs);
 const ra = we(), Av = ra.debug === "true" || ra.debug === !0, Rv = "/api/system/canvas", Vl = async (t, e) => {
   const r = `${Me}${e || Rv}`;
@@ -14725,7 +14725,7 @@ Gl([
   })
 ], Gr.prototype, "router", 2);
 Gr = Gl([
-  D(Yl)
+  x(Yl)
 ], Gr);
 const Wl = new Pe({
   class: Gr,
@@ -15406,19 +15406,19 @@ class Jl extends xt {
     this.drawScrollingImage(s, r, n, i), this.checkScrollCompletion(s, r, n, i);
   }
   drawScrollingImage(s, r, n, o) {
-    var h, f, p, m, y, v, _, U, x;
+    var h, f, p, m, y, v, _, U, C;
     const i = this.img.width / this.img.height;
     let a, c;
     ((h = this.scrollConfig) == null ? void 0 : h.maintainAspectRatio) !== !1 ? (f = this.scrollConfig) != null && f.height ? (c = this.scrollConfig.height, a = c * i) : (p = this.scrollConfig) != null && p.width ? (a = this.scrollConfig.width, c = a / i) : n === "left" || n === "right" ? (c = r, a = c * i) : (a = s, c = a / i) : (a = ((m = this.scrollConfig) == null ? void 0 : m.width) || s, c = ((y = this.scrollConfig) == null ? void 0 : y.height) || r);
     let u, d;
-    switch (n === "left" || n === "right" ? (u = 0, ((v = this.scrollConfig) == null ? void 0 : v.offsetY) === "center" || ((_ = this.scrollConfig) == null ? void 0 : _.offsetY) === void 0 ? d = (r - c) / 2 : d = this.scrollConfig.offsetY) : (((U = this.scrollConfig) == null ? void 0 : U.offsetX) === "center" || ((x = this.scrollConfig) == null ? void 0 : x.offsetX) === void 0 ? u = (s - a) / 2 : u = this.scrollConfig.offsetX, d = 0), n) {
+    switch (n === "left" || n === "right" ? (u = 0, ((v = this.scrollConfig) == null ? void 0 : v.offsetY) === "center" || ((_ = this.scrollConfig) == null ? void 0 : _.offsetY) === void 0 ? d = (r - c) / 2 : d = this.scrollConfig.offsetY) : (((U = this.scrollConfig) == null ? void 0 : U.offsetX) === "center" || ((C = this.scrollConfig) == null ? void 0 : C.offsetX) === void 0 ? u = (s - a) / 2 : u = this.scrollConfig.offsetX, d = 0), n) {
       case "left": {
         const $ = s - this.position;
         if ($ < s && $ > -a && this.ctx.drawImage(this.img, $, d, a, c), this.loopConfig && this.pauseDuration === 0 && this.position > o) {
-          const L = $ + a + o;
-          L < s && this.ctx.drawImage(
+          const R = $ + a + o;
+          R < s && this.ctx.drawImage(
             this.img,
-            L,
+            R,
             d,
             a,
             c
@@ -15429,10 +15429,10 @@ class Jl extends xt {
       case "right": {
         const $ = -a + this.position;
         if ($ > -a && $ < s && this.ctx.drawImage(this.img, $, d, a, c), this.loopConfig && this.pauseDuration === 0 && $ - o - a > -a) {
-          const L = $ - a - o;
-          L < s && this.ctx.drawImage(
+          const R = $ - a - o;
+          R < s && this.ctx.drawImage(
             this.img,
-            L,
+            R,
             d,
             a,
             c
@@ -15443,11 +15443,11 @@ class Jl extends xt {
       case "up": {
         const $ = r - this.position;
         if ($ > -c && $ < r && this.ctx.drawImage(this.img, u, $, a, c), this.loopConfig && this.pauseDuration === 0 && $ + c + o < r) {
-          const L = $ + c + o;
-          L > -c && this.ctx.drawImage(
+          const R = $ + c + o;
+          R > -c && this.ctx.drawImage(
             this.img,
             u,
-            L,
+            R,
             a,
             c
           );
@@ -15457,11 +15457,11 @@ class Jl extends xt {
       case "down": {
         const $ = -c + this.position;
         if ($ > -c && $ < r && this.ctx.drawImage(this.img, u, $, a, c), this.loopConfig && this.pauseDuration === 0 && $ - o - c > -c) {
-          const L = $ - c - o;
-          L < r && this.ctx.drawImage(
+          const R = $ - c - o;
+          R < r && this.ctx.drawImage(
             this.img,
             u,
-            L,
+            R,
             a,
             c
           );
@@ -16104,7 +16104,7 @@ us([
   hn("/api/ui/canvas/endpoint")
 ], ot.prototype, "handleEndpointCreation", 1);
 ot = us([
-  D(eu)
+  x(eu)
 ], ot);
 const Ns = new Be({
   class: ot,
@@ -16119,7 +16119,7 @@ const Ns = new Be({
     });
     return [void 0, t == null ? void 0 : t.data.serialNumber];
   } catch (t) {
-    if (t instanceof G)
+    if (t instanceof Y)
       return Qr.error(`Error fetching device serial number: ${t.payload.error}`), [t.payload.error, void 0];
   }
   return ["unknownError", void 0];
@@ -16131,7 +16131,7 @@ const Ns = new Be({
     });
     return t ? [void 0, t.data] : ["unknownError", void 0];
   } catch (t) {
-    if (t instanceof G)
+    if (t instanceof Y)
       return Qr.error(`Error fetching device serial number: ${t.payload.error}`), [t.payload.error, void 0];
   }
   return ["unknownError", void 0];
@@ -16350,7 +16350,7 @@ nu([
   })
 ], Zr.prototype, "handleCriticalDataChanged", 1);
 Zr = nu([
-  D(ou)
+  x(ou)
 ], Zr);
 const po = new Be({
   class: Zr,
@@ -16407,7 +16407,7 @@ let go = class {
   }
 };
 go = aw([
-  D(iu)
+  x(iu)
 ], go);
 const au = new Pe({
   class: go,
@@ -16425,7 +16425,7 @@ const au = new Pe({
     });
     return [void 0, t == null ? void 0 : t.data];
   } catch (t) {
-    if (t instanceof G)
+    if (t instanceof Y)
       return ia.error(`Error fetching log file size: ${t.payload.error}`), [t.payload.error, void 0];
   }
   return ["unknownError", void 0];
@@ -16504,7 +16504,7 @@ lu([
   Ue
 ], Xr.prototype, "_models", 2);
 Xr = lu([
-  D(uu)
+  x(uu)
 ], Xr);
 const Jr = new Be({
   class: Xr,
@@ -16579,7 +16579,7 @@ let mo = class {
 };
 mo = mw([
   Po(),
-  D(hu)
+  x(hu)
 ], mo);
 const yo = new Pe({
   class: mo,
@@ -16671,7 +16671,7 @@ li([
   })
 ], Us.prototype, "handleStorageAvailability", 1);
 Us = li([
-  D(fu)
+  x(fu)
 ], Us);
 const js = new Be({
   class: Us,
@@ -16753,7 +16753,7 @@ mu([
   di()
 ], en.prototype, "install", 1);
 en = mu([
-  D(yu)
+  x(yu)
 ], en);
 const bu = new Pe({
   class: en,
@@ -16811,7 +16811,7 @@ let Jt = class {
   }
   async syncAvailableUpdates() {
     const t = await pu();
-    ae(() => {
+    ce(() => {
       const e = t.map(
         (s) => `${s.deviceId}-${s.manifestId}`
       );
@@ -16851,7 +16851,7 @@ Sn([
   gh({ dependencies: (t) => [t.isUsbInserted] })
 ], Jt.prototype, "usbInsertedEffect", 1);
 Jt = Sn([
-  D(vu)
+  x(vu)
 ], Jt);
 const tn = new Be({
   class: Jt,
@@ -16913,7 +16913,7 @@ class s$ {
    * */
   registerTroubleRankMapper(e, s) {
     return M.propertyMapper.registerPropertyMapper(
-      ce.TroubleRank,
+      le.TroubleRank,
       e,
       s
     ), this;
@@ -16929,7 +16929,7 @@ class s$ {
    * */
   registerTroubleRoleMapper(e, s) {
     return M.propertyMapper.registerPropertyMapper(
-      ce.TroubleRole,
+      le.TroubleRole,
       e,
       s
     ), this;
@@ -16945,7 +16945,7 @@ class s$ {
    * */
   registerTroubleColorMapper(e, s) {
     return M.propertyMapper.registerPropertyMapper(
-      ce.TroubleColor,
+      le.TroubleColor,
       e,
       s
     ), this;
@@ -16965,7 +16965,7 @@ class s$ {
   }
   registerRegionServicePathMapper(e) {
     return M.propertyMapper.registerPropertyMapper(
-      ce.RegionServicePath,
+      le.RegionServicePath,
       e
     ), this;
   }
@@ -16986,7 +16986,7 @@ class s$ {
   }
   registerConfigServicePathMapper(e) {
     return M.propertyMapper.registerPropertyMapper(
-      ce.ConfigServicePath,
+      le.ConfigServicePath,
       e
     ), this;
   }
@@ -17035,24 +17035,24 @@ const da = He(), i$ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defin
   default: da,
   kosServiceRequest: Pw
 }, Symbol.toStringTag, { value: "Module" }));
-function Aw(t) {
-  return at(t);
-}
-const ha = He(), a$ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  api: ha,
-  default: ha,
-  kosServiceRequest: Aw
-}, Symbol.toStringTag, { value: "Module" }));
 function _u(t) {
   return at(t);
 }
-const bo = He(), c$ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const bo = He(), a$ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   api: bo,
   default: bo,
   kosServiceRequest: _u
 }, Symbol.toStringTag, { value: "Module" }));
+function Aw(t) {
+  return at(t);
+}
+const ha = He(), c$ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  api: ha,
+  default: ha,
+  kosServiceRequest: Aw
+}, Symbol.toStringTag, { value: "Module" }));
 function Rw(t) {
   return at(t);
 }
@@ -17324,7 +17324,7 @@ function Cu(t, e, s = {}) {
       tracker: c,
       id: Pc
     });
-    n && (h.namespace = n), g.debug(`waiting for future ${h.id} to be ready`), await Se(h), g.debug(`future ${h.id} is ready`), ae(() => {
+    n && (h.namespace = n), g.debug(`waiting for future ${h.id} to be ready`), await Se(h), g.debug(`future ${h.id} is ready`), ce(() => {
       g.debug(`Adding future ${h.id} to futureHandler`), this.futureHandler.addFuture(h, r);
     }), o && u && (d = te(() => {
       (h.status === "CANCELLED" || h.endState === Mt.Canceled) && (g.debug(`Future ${h.id} cancelled, aborting request`), u == null || u.abort());
@@ -17515,8 +17515,8 @@ function v$(t, e, s, r) {
     (y !== d || v !== h || _ !== f) && (d = y, h = v, f = _, p.forEach((U) => {
       try {
         U(d, h);
-      } catch (x) {
-        console.warn("Progress callback error:", x);
+      } catch (C) {
+        console.warn("Progress callback error:", C);
       }
     }));
   })), o.finally(() => {
@@ -17676,7 +17676,7 @@ const Jw = {
 }, tE = ({
   children: t
 }) => {
-  const [e, s] = E(), r = re(
+  const [e, s] = E(), r = ne(
     (n) => (s(n), !0),
     [s]
   );
@@ -17687,7 +17687,7 @@ const Jw = {
     Du.debug("Default implementation being used. Do Nothing.");
   }
 }, fi = zs(sE), M$ = ({ children: t }) => {
-  const [e, s] = E([]), r = re(
+  const [e, s] = E([]), r = ne(
     (n) => {
       e.includes(n) || (Du.debug("adding to hierarchy context", n.id), s((o) => [...o, n]));
     },
@@ -17701,7 +17701,7 @@ const Jw = {
       "useContextModelHierarchy must be used within a KosModelCollectionProvider"
     );
   const s = (t == null ? void 0 : t.filter) || rE;
-  return Y(
+  return W(
     () => e.models.filter(s),
     [e.models, s]
   );
@@ -17811,7 +17811,7 @@ async function mE(t, e) {
   }
   return await (u == null ? void 0 : u.whenReady()), u ? (c = u.modelData, { kosModel: u, model: c }) : { kosModel: void 0, model: void 0 };
 }
-const oe = (t) => {
+const ie = (t) => {
   const { modelId: e, modelType: s, activate: r, destroyOnUnmount: n } = t, o = dE(), [i, a] = E(!1), [c, u] = E(), { kosModel: d, model: h } = gE(
     e || s || "",
     () => mE(o.kosCore, t)
@@ -17822,7 +17822,7 @@ const oe = (t) => {
     async function f() {
       try {
         return await o.kosCore.whenReady(), r && await (d == null ? void 0 : d.fsm.transitionTo(
-          k.GO_ACTIVE,
+          L.GO_ACTIVE,
           b.ACTIVE
         )), a(!0), d;
       } catch (m) {
@@ -17843,7 +17843,7 @@ const oe = (t) => {
           const m = o.kosCore.modelManager.getModelById(
             h.id
           );
-          m == null || m.fsm.transitionTo(k.GO_INACTIVE, b.INACTIVE).then(() => {
+          m == null || m.fsm.transitionTo(L.GO_INACTIVE, b.INACTIVE).then(() => {
             if (n) {
               const y = h.id;
               Ve(h).then(() => {
@@ -17877,13 +17877,13 @@ const oe = (t) => {
   };
 }, Pu = () => {
   const t = no.type;
-  return oe({
+  return ie({
     modelId: t,
     modelType: no.type,
     options: {}
   });
 }, Au = zs(void 0), S$ = ({ children: t }) => {
-  const { model: e, ready: s } = Pu(), r = Y(() => s && e ? { model: e } : {}, [s, e]);
+  const { model: e, ready: s } = Pu(), r = W(() => s && e ? { model: e } : {}, [s, e]);
   return /* @__PURE__ */ w(Au.Provider, { value: r, children: t });
 }, O$ = () => {
   const t = wt(Au);
@@ -17892,7 +17892,7 @@ const oe = (t) => {
   return t;
 }, Ru = () => {
   const t = lo.type;
-  return oe({
+  return ie({
     modelId: t,
     modelType: lo.type,
     options: {}
@@ -17907,7 +17907,7 @@ function I$(t) {
 const ku = zs(
   void 0
 ), C$ = ({ children: t }) => {
-  const { model: e, ready: s } = Ru(), r = Y(() => s && e ? { model: e } : {}, [s, e]);
+  const { model: e, ready: s } = Ru(), r = W(() => s && e ? { model: e } : {}, [s, e]);
   return /* @__PURE__ */ w(ku.Provider, { value: r, children: t });
 }, D$ = () => {
   const t = wt(ku);
@@ -17931,26 +17931,26 @@ const Fu = zs(void 0), bE = () => {
   rootUrl: n,
   descriptorResolver: o
 }) => {
-  const [i, a] = E(!1), [c, u] = E(), [d, h] = E(), f = n || bE(), p = Y(() => e ?? "app/system", [e]);
+  const [i, a] = E(!1), [c, u] = E(), [d, h] = E(), f = n || bE(), p = W(() => e ?? "app/system", [e]);
   S(() => {
     async function v() {
-      const U = (Array.isArray(p) ? p : [p]).map((Q) => (o || wv(Q))()), L = (await Promise.allSettled(U)).map((Q) => {
-        if (Q.status === "rejected") {
-          g.warn("Failed to load localization descriptor", Q.reason);
+      const U = (Array.isArray(p) ? p : [p]).map((V) => (o || wv(V))()), R = (await Promise.allSettled(U)).map((V) => {
+        if (V.status === "rejected") {
+          g.warn("Failed to load localization descriptor", V.reason);
           return;
         }
-        return Q.value;
-      }).filter((Q) => !!Q).reverse().reduce((Q, le) => {
-        const B = le.path;
-        return Object.keys(le.namespaces).forEach((ds) => {
-          const ie = le.namespaces[ds];
-          ie.basePath = B;
+        return V.value;
+      }).filter((V) => !!V).reverse().reduce((V, re) => {
+        const B = re.path;
+        return Object.keys(re.namespaces).forEach((ds) => {
+          const ae = re.namespaces[ds];
+          ae.basePath = B;
         }), {
-          ...Q,
-          namespaces: { ...Q.namespaces, ...le.namespaces }
+          ...V,
+          namespaces: { ...V.namespaces, ...re.namespaces }
         };
       }, {});
-      u(L);
+      u(R);
     }
     v();
   }, [p, o]), S(() => {
@@ -17968,7 +17968,7 @@ const Fu = zs(void 0), bE = () => {
     }
     v();
   }, [s, c, r, f]);
-  const m = Y(() => i ? {
+  const m = W(() => i ? {
     setLocale: (v) => {
       d && (d.currentLocale = v);
     }
@@ -17987,7 +17987,7 @@ const Fu = zs(void 0), bE = () => {
   return t;
 }, vE = () => {
   const t = Ns.type;
-  return oe({
+  return ie({
     modelId: t,
     modelType: Ns.type,
     options: {}
@@ -18041,7 +18041,7 @@ const Gn = 10, TE = Sa(
       });
       u(h);
     }, [t]);
-    const d = re(
+    const d = ne(
       (h) => {
         if (a.current && n) {
           const f = a.current.getContext("2d");
@@ -18086,7 +18086,7 @@ const Gn = 10, TE = Sa(
   align-items: center;
 `, OE = () => {
   const t = po.type;
-  return oe({
+  return ie({
     modelId: t,
     modelType: po.type,
     options: {}
@@ -18121,7 +18121,7 @@ function F$(t) {
 }
 const IE = () => {
   const t = Jr.type;
-  return oe({
+  return ie({
     modelId: t,
     modelType: Jr.type,
     options: {}
@@ -18135,7 +18135,7 @@ function N$(t) {
 }
 const CE = () => {
   const t = ao.type;
-  return oe({
+  return ie({
     modelId: t,
     modelType: ao.type,
     options: {}
@@ -18185,7 +18185,7 @@ const B$ = (t) => {
     };
   }, [n, e]), [s, { ready: n, error: i }];
 }, xE = () => {
-  const [t, e] = E(!1), [s, r] = E([]), n = js.type, o = oe({
+  const [t, e] = E(!1), [s, r] = E([]), n = js.type, o = ie({
     modelId: n,
     modelType: js.type,
     options: {}
@@ -18237,11 +18237,11 @@ const Yn = g.createLogger({ name: "use-timer" }), q$ = ({
       d.unsubscribe();
     };
   }, [s, t, o]);
-  const i = re(() => {
+  const i = ne(() => {
     o ? o.start() : Yn.warn(`Timer with name ${t} does not exist.`);
-  }, [o, t]), a = re(() => {
+  }, [o, t]), a = ne(() => {
     o ? o.reset() : Yn.warn(`Timer with name ${t} does not exist.`);
-  }, [o, t]), c = re(() => {
+  }, [o, t]), c = ne(() => {
     o ? o.pause() : Yn.warn(`Timer with name ${t} does not exist.`);
   }, [o, t]);
   return {
@@ -18323,13 +18323,13 @@ const UE = async () => {
   ), i = s.join("__"), a = ba(
     i,
     () => jE(o, r, n)
-  ), c = Y(() => ({
+  ), c = W(() => ({
     exists: (d) => {
       const h = e != null && e.keyPrefix ? `${e.keyPrefix}.${d}` : d;
       return a ? a.exists(h) : !1;
     }
   }), [e == null ? void 0 : e.keyPrefix, a]);
-  return { t: re(
+  return { t: ne(
     (d, h) => {
       const f = e != null && e.keyPrefix ? `${e.keyPrefix}.${d}` : d;
       return a ? a.resolveKey(f, h) : (g.debug(
@@ -18340,7 +18340,7 @@ const UE = async () => {
   ), i18n: c };
 }, BE = () => {
   const t = nt.type;
-  return oe({
+  return ie({
     modelId: t,
     modelType: nt.type,
     options: {}
@@ -18352,10 +18352,10 @@ function V$(t) {
     return /* @__PURE__ */ w(n, { ...r, children: /* @__PURE__ */ w(t, { ...e, translationContainer: s }) });
   };
 }
-const G$ = (t) => oe({
+const G$ = (t) => ie({
   modelId: t,
   modelType: Hr.type
-}), Nu = () => oe({
+}), Nu = () => ie({
   modelId: Ls.type,
   modelType: Ls.type,
   options: {}
@@ -18363,7 +18363,7 @@ const G$ = (t) => oe({
   troubleType: t,
   condition: e
 }) => {
-  const { model: s } = Nu(), [r, n] = E(!1), [o, i] = E([]), a = re(() => {
+  const { model: s } = Nu(), [r, n] = E(!1), [o, i] = E([]), a = ne(() => {
     var c, u;
     return o.length > 0 && ((c = o[0]) != null && c.resolvable) ? (u = o[0]) == null ? void 0 : u.resolve() : Promise.resolve(void 0);
   }, [o]);
@@ -18384,7 +18384,7 @@ function W$(t) {
   };
 }
 const HE = () => {
-  const t = tn.type, e = oe({
+  const t = tn.type, e = ie({
     modelId: t,
     modelType: tn.type,
     options: {},
@@ -18408,7 +18408,7 @@ function Q$(t) {
   };
 }
 const Z$ = ({ path: t, propKey: e }) => {
-  const { status: s } = oe({
+  const { status: s } = ie({
     modelType: Ar.type,
     modelId: t,
     options: {
@@ -18452,7 +18452,7 @@ const Z$ = ({ path: t, propKey: e }) => {
     mappedOptions: [],
     updateProperty: t == null ? void 0 : t.updateProperty,
     displayOptions: t == null ? void 0 : t.displayOptions
-  }), c = re(
+  }), c = ne(
     (u) => {
       var h;
       let d = "factory";
@@ -18607,14 +18607,14 @@ function XE({
   };
 }
 function ju(t = "long", e = [2018, 2028]) {
-  return Y(
+  return W(
     () => WE(t, e),
     [t, e]
   );
 }
 function JE(t = "long", e = [2018, 2028], s = "en-US") {
   const r = ju(t, e);
-  return Y(
+  return W(
     () => r.map((o) => ({
       label: o.toLocaleString(s).replace(",", ""),
       value: o
@@ -18623,17 +18623,17 @@ function JE(t = "long", e = [2018, 2028], s = "en-US") {
   );
 }
 function eM(t, e = "en-US") {
-  return Y(
+  return W(
     () => Uu(t, e),
     [t, e]
   );
 }
 function tM(t, e = "en-US") {
-  const s = Y(() => GE(), []), r = Y(
+  const s = W(() => GE(), []), r = W(
     () => Uu(t, e),
     [t, e]
   );
-  return Y(
+  return W(
     () => [...Array(12).keys()].map((o) => ({
       label: r[o],
       value: Number(s[o])
@@ -18643,7 +18643,7 @@ function tM(t, e = "en-US") {
 }
 function Bu(t, e) {
   const s = ke(t);
-  return Y(
+  return W(
     () => VE(s, e),
     [e, s]
   );
@@ -18654,7 +18654,7 @@ const sM = (t, e, s, r = []) => {
 };
 function rM(t, e, s = "en-US", r = []) {
   const n = Bu(t, e);
-  return Y(
+  return W(
     () => n.map((i) => ({
       label: i.toLocaleString(s),
       value: i,
@@ -18664,7 +18664,7 @@ function rM(t, e, s = "en-US", r = []) {
   );
 }
 function nM(t = "en-US", e = "short") {
-  return Y(
+  return W(
     () => ZE(t, e),
     [t, e]
   );
@@ -18679,7 +18679,7 @@ function oM({
   return { formattedDate: yt(o, r) };
 }
 function iM(t, e, s) {
-  return Y(
+  return W(
     () => QE(t, e, s),
     [t, e, s]
   );
@@ -18717,11 +18717,11 @@ function tS({
   }, [r]);
   const {
     yearsArray: U,
-    yearsOptionsArray: x,
+    yearsOptionsArray: C,
     monthsArray: $,
-    monthsOptionsArray: L,
-    daysArray: Q,
-    daysOptionsArray: le,
+    monthsOptionsArray: R,
+    daysArray: V,
+    daysOptionsArray: re,
     calendarDayArray: B,
     dayNamesArray: ds
   } = XE({
@@ -18735,7 +18735,7 @@ function tS({
       dayFormat: i
     },
     daysOfWeekFilter: u
-  }), { formattedDate: ie } = oM({
+  }), { formattedDate: ae } = oM({
     year: d,
     month: m,
     day: v,
@@ -18788,14 +18788,14 @@ function tS({
       month: m,
       day: v,
       yearsArray: U,
-      yearsOptionsArray: x,
+      yearsOptionsArray: C,
       monthsArray: $,
-      monthsOptionsArray: L,
-      daysArray: Q,
-      daysOptionsArray: le,
+      monthsOptionsArray: R,
+      daysArray: V,
+      daysOptionsArray: re,
       calendarDayNames: ds,
       calendarDayArray: B,
-      formattedDate: ie
+      formattedDate: ae
     }
   };
 }
@@ -18805,7 +18805,7 @@ function cM({
   timeFormat: s,
   options: r = {}
 }) {
-  const [n, o] = E("Formatting Time..."), [i, a] = E("Formatting Date..."), c = !!r.ignoreDateFormat, { model: u, ready: d } = oe({
+  const [n, o] = E("Formatting Time..."), [i, a] = E("Formatting Date..."), c = !!r.ignoreDateFormat, { model: u, ready: d } = ie({
     modelId: pe.type,
     modelType: pe.type,
     options: {}
@@ -18891,7 +18891,7 @@ function rS(t, e = {}) {
   }, [t, s, r]);
 }
 const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, children: t.format }, t.id), nS = (t = uM) => {
-  const [e, s] = E([]), [r, n] = E(), { model: o, ready: i } = oe({
+  const [e, s] = E([]), [r, n] = E(), { model: o, ready: i } = ie({
     modelType: pe.type,
     modelId: pe.type,
     options: {}
@@ -18914,7 +18914,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
       c();
     };
   }, [o == null ? void 0 : o.selectedDateFormat, o == null ? void 0 : o.dateFormatId]);
-  const a = re(
+  const a = ne(
     (c) => {
       var d;
       let u = "";
@@ -18935,7 +18935,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
     }
   };
 }, dM = (t) => /* @__PURE__ */ w("option", { title: t, value: t, children: t }, t), Hu = "kos:service:region:settings", qu = "timeZone", hM = `${Hu}-${qu}`, oS = (t = dM) => {
-  const [e, s] = E([]), [r, n] = E(""), { model: o, ready: i } = oe({
+  const [e, s] = E([]), [r, n] = E(""), { model: o, ready: i } = ie({
     modelType: pe.type,
     modelId: pe.type,
     options: {}
@@ -18960,7 +18960,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
       u();
     };
   }, [a.value]);
-  const c = re((u) => {
+  const c = ne((u) => {
     var h;
     let d = "factory";
     typeof u == "string" ? d = u : (h = u == null ? void 0 : u.target) != null && h.value && (d = u.target.value), d && ya(d);
@@ -18979,7 +18979,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
     }
   };
 }, zu = "kos:service:region", Ku = "regionId", fM = `${zu}-${Ku}`, pM = (t) => /* @__PURE__ */ w("option", { title: t, value: t, children: t }, t), gM = (t = pM) => {
-  const [e, s] = E([]), [r, n] = E("factory"), { model: o, ready: i } = oe({
+  const [e, s] = E([]), [r, n] = E("factory"), { model: o, ready: i } = ie({
     modelType: pe.type,
     modelId: pe.type
   }), a = os.factory(
@@ -19003,7 +19003,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
       u();
     };
   }, [a.value]);
-  const c = re((u) => {
+  const c = ne((u) => {
     var h;
     let d = "factory";
     typeof u == "string" ? d = u : (h = u == null ? void 0 : u.target) != null && h.value && (d = u.target.value), d && Dw(d);
@@ -19021,7 +19021,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
     }
   };
 }, mM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, children: t.format }, t.id), iS = (t = mM) => {
-  const [e, s] = E([]), [r, n] = E(), { model: o, ready: i } = oe({
+  const [e, s] = E([]), [r, n] = E(), { model: o, ready: i } = ie({
     modelType: pe.type,
     modelId: pe.type,
     options: {}
@@ -19044,7 +19044,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
       c();
     };
   }, [o == null ? void 0 : o.selectedTimeFormat, o == null ? void 0 : o.timeFormatId]);
-  const a = re(
+  const a = ne(
     (c) => {
       var d;
       let u = "";
@@ -19064,7 +19064,7 @@ const uM = (t) => /* @__PURE__ */ w("option", { title: t.id, value: t.format, ch
       options: e
     }
   };
-}, aS = (t, e) => Y(() => Dc(t), e), yM = {
+}, aS = (t, e) => W(() => Dc(t), e), yM = {
   config: { attributes: !0, childList: !0, subtree: !0 }
 };
 function cS(t, e, s = yM) {
@@ -19146,7 +19146,7 @@ const vM = () => {
   }, [s, t]), [t];
 };
 function wM(t = !1, e = "2-digit") {
-  return Y(() => {
+  return W(() => {
     const s = t ? 12 : 24;
     return Array.from({ length: s }, (r, n) => {
       const o = t && n === 0 ? 12 : n % s;
@@ -19158,7 +19158,7 @@ function wM(t = !1, e = "2-digit") {
   }, [e, t]);
 }
 function va(t, e = "2-digit", s = 0, r = 0) {
-  return Y(
+  return W(
     () => Array.from({ length: t }, (n, o) => {
       const i = String(o + s);
       return {
@@ -19170,7 +19170,7 @@ function va(t, e = "2-digit", s = 0, r = 0) {
   );
 }
 function EM(t = "en-US") {
-  return Y(
+  return W(
     () => ["AM", "PM"].map((e) => {
       const s = new Intl.DateTimeFormat(t, {
         hour: "2-digit",
@@ -19207,22 +19207,22 @@ function TM({
   locale: s = "en-US",
   format: r = "HH:mm"
 }) {
-  const [n, o] = E(e), i = re((y) => {
+  const [n, o] = E(e), i = ne((y) => {
     o((v) => {
       const _ = new Date(v);
       return _.setHours(Number(y)), _;
     });
-  }, []), a = re((y) => {
+  }, []), a = ne((y) => {
     o((v) => {
       const _ = new Date(v);
       return _.setMinutes(Number(y)), _;
     });
-  }, []), c = re((y) => {
+  }, []), c = ne((y) => {
     o((v) => {
       const _ = new Date(v);
       return _.setSeconds(Number(y)), _;
     });
-  }, []), u = re((y) => {
+  }, []), u = ne((y) => {
     const v = new Date(y);
     o(v);
   }, []), d = _M(n, r), { hourOptions: h, minuteOptions: f, secondOptions: p, amPmOptions: m } = MM({
@@ -19243,7 +19243,7 @@ function TM({
   };
 }
 const uS = (t) => {
-  const { regionModel: e } = gM(), s = Y(() => ({ hour12: e == null ? void 0 : e.is12HourTimeFormat }), [e == null ? void 0 : e.is12HourTimeFormat]);
+  const { regionModel: e } = gM(), s = W(() => ({ hour12: e == null ? void 0 : e.is12HourTimeFormat }), [e == null ? void 0 : e.is12HourTimeFormat]);
   return TM({
     ...t,
     locale: e == null ? void 0 : e.regionId,
@@ -19252,7 +19252,7 @@ const uS = (t) => {
   });
 };
 function dS(t, e, s = {}) {
-  const { disposeOnUnmount: r = !0 } = s, [n, o] = E(!1), [i, a] = E(void 0), c = bt(null), u = bt(!0), d = bt(!1), h = Y(() => {
+  const { disposeOnUnmount: r = !0 } = s, [n, o] = E(!1), [i, a] = E(void 0), c = bt(null), u = bt(!0), d = bt(!1), h = W(() => {
     if (!u.current && c.current && r && Fn(c.current)) {
       const p = c.current;
       Promise.resolve().then(() => {
@@ -19387,7 +19387,7 @@ let vo = class {
   }
 };
 vo = OM([
-  D(Gu)
+  x(Gu)
 ], vo);
 const pS = new Pe({
   class: vo,
@@ -19423,7 +19423,7 @@ let sn = class {
 };
 AM(sn, "Registration");
 sn = PM([
-  D({ modelTypeId: RM, singleton: !1 }),
+  x({ modelTypeId: RM, singleton: !1 }),
   Gs()
 ], sn);
 const Yu = sn.Registration;
@@ -19466,7 +19466,7 @@ let rn = class {
 };
 UM(rn, "Registration");
 rn = NM([
-  D({ modelTypeId: jM, singleton: !1 }),
+  x({ modelTypeId: jM, singleton: !1 }),
   Ao({
     containerOptions: {
       sortKey: "pinNum"
@@ -19514,7 +19514,7 @@ Zu([
   Ue
 ], Bs.prototype, "_pins", 2);
 Bs = Zu([
-  D({ modelTypeId: zM, singleton: !1 }),
+  x({ modelTypeId: zM, singleton: !1 }),
   Gs()
 ], Bs);
 const wo = Bs.Registration;
@@ -19638,7 +19638,7 @@ sd([
   })
 ], Hs.prototype, "handleGpioChipInit", 1);
 Hs = sd([
-  D({ modelTypeId: WM, singleton: !0 }),
+  x({ modelTypeId: WM, singleton: !0 }),
   Ao({
     containerOptions: {
       sortKey: "num"
@@ -19693,7 +19693,7 @@ export {
   Bm as FUTURE_MODEL_TYPE,
   Pc as FUTURE_NOT_ASSIGNED,
   Ig as FeatureFlagService,
-  G as FetchError,
+  Y as FetchError,
   vr as FutureAliases,
   _t as FutureContainerFactory,
   Qm as FutureContainerModel,
@@ -19725,10 +19725,10 @@ export {
   rt as HttpRouteHandlers,
   Ro as KOS_EXECUTION_CONTEXT,
   Qn as KOS_MODEL_ID,
-  o$ as KOS_SERVICE,
-  i$ as KOS_SERVICE_1_6_5,
-  a$ as KOS_SERVICE_1_8_1,
-  c$ as KOS_SERVICE_1_9_X,
+  c$ as KOS_SERVICE,
+  o$ as KOS_SERVICE_1_6_5,
+  i$ as KOS_SERVICE_1_8_1,
+  a$ as KOS_SERVICE_1_9_X,
   el as KeyValue,
   UT as KeyValueServices,
   Ee as Kos,
@@ -19737,7 +19737,7 @@ export {
   zg as KosContextBean,
   ee as KosContextManager,
   T as KosCore,
-  ce as KosCoreModelPropertyMapper,
+  le as KosCoreModelPropertyMapper,
   Ic as KosDataContainer,
   T_ as KosDependencyTypes,
   nb as KosExpressionEvaluator,
@@ -19755,7 +19755,7 @@ export {
   M$ as KosModelCollectionProvider,
   Je as KosModelContainer,
   hi as KosModelContext,
-  k as KosModelEvents,
+  L as KosModelEvents,
   Er as KosModelFactory,
   aE as KosModelLoader,
   cE as KosModelLoaderDisplay,
@@ -19845,7 +19845,7 @@ export {
   JT as StorageDeviceServices,
   pS as StudioProperties,
   fS as StudioPropertiesServices,
-  ne as SubscriptionHandlers,
+  oe as SubscriptionHandlers,
   Su as TIMER_END,
   Tu as TIMER_EVENT,
   $u as TOPIC_TIMER_TICK_EVENT,
@@ -19869,10 +19869,10 @@ export {
   bu as UsbUpdate,
   tn as UsbUpdateContainer,
   e$ as UsbUpdateServices,
-  l$ as VFS_SERVICE,
-  u$ as VFS_SERVICE_1_6_5,
-  d$ as VFS_SERVICE_1_8_1,
-  h$ as VFS_SERVICE_1_9_X,
+  h$ as VFS_SERVICE,
+  l$ as VFS_SERVICE_1_6_5,
+  u$ as VFS_SERVICE_1_8_1,
+  d$ as VFS_SERVICE_1_9_X,
   oc as ViewModelConfig,
   Cv as WS_EVENT_TYPE,
   Fe as WebSocketEvents,
@@ -19996,7 +19996,7 @@ export {
   G_ as isPrintable,
   WT as isTroubleAware,
   pr as isValidDate,
-  ae as kosAction,
+  ce as kosAction,
   te as kosAutoEffect,
   Ue as kosChild,
   E_ as kosCompanion,
@@ -20013,7 +20013,7 @@ export {
   dh as kosFutureAware,
   O_ as kosLogger,
   Gs as kosLoggerAware,
-  D as kosModel,
+  x as kosModel,
   gh as kosModelEffect,
   __ as kosMultipleFutureAware,
   xc as kosObservable,
@@ -20117,7 +20117,7 @@ export {
   wM as useHourValues,
   dE as useKosCore,
   nS as useKosDateFormats,
-  oe as useKosModel,
+  ie as useKosModel,
   gM as useKosRegions,
   Pu as useKosTime,
   O$ as useKosTimeContext,