@kosdev-code/kos-ui-sdk 0.1.0-dev.5697 → 0.1.0-dev.5698

package/index.js

@@ -356,7 +356,7 @@ function Pa(t, e, s) {
         const d = o(u);
         if (i.has(d))
           return;
-        i.add(d), i.size > 1e3 && Array.from(i).slice(0, 500).forEach((f) => i.delete(f));
+        i.add(d), i.size > 1e3 && Array.from(i).slice(0, 500).forEach((p) => i.delete(p));
       }
       await e(u);
     }
@@ -365,8 +365,8 @@ function Pa(t, e, s) {
       const u = await r(), d = Array.isArray(u) ? u : [u];
       for (const h of d)
         if (o) {
-          const f = o(h);
-          i.has(f) || (i.add(f), await e(h));
+          const p = o(h);
+          i.has(p) || (i.add(p), await e(h));
         } else
           await e(h);
     } catch (u) {
@@ -393,7 +393,7 @@ function Ra(t) {
         return a.data;
       const h = await en(e, {
         getCurrentState: o,
-        shouldUseFetchedState: (f) => !!f,
+        shouldUseFetchedState: (p) => !!p,
         timeout: d
       });
       return a.state = "connected", a.data = h, u(), h;
@@ -539,7 +539,7 @@ const pd = [
   "font-weight: bold"
 ].join(";"), Ws = (t) => (e) => {
   C.getLevel() <= t && e();
-}, g = {
+}, m = {
   ...C,
   ifDebug: Ws(C.levels.DEBUG),
   ifInfo: Ws(C.levels.INFO),
@@ -567,7 +567,7 @@ const pd = [
   }
 }, ne = Symbol("SubscriptionHandlers"), N = Symbol("DependencyModels"), dr = Symbol("FutureService"), yt = Symbol("ChildModels"), hr = Symbol("ParentModel"), fr = Symbol("LogConfig"), vn = Symbol("ReferenceConfig"), Ba = Symbol("KosModelSymbol"), et = Symbol("ModelEffects"), vt = Symbol("CompanionParentModel"), Ha = Symbol("FutureContainerSetup"), qa = Symbol(
   "MultipleFutureContainerSetup"
-), pr = Symbol("FutureAliases"), za = Symbol("TroubleAwareSetup"), Va = Symbol("LoggerSetup"), Ka = Symbol("ContainerAwareSetup"), Bs = Symbol("StateMachineSetup"), Es = Symbol("StateEntryHandlers"), gr = Symbol("StateExitHandlers"), EM = Symbol("StateActionHandlers"), tn = Symbol("OptionsRequired"), md = Symbol("KosViewModelSymbol"), Ga = Symbol("ViewModelConfig"), yd = Symbol("ReloadAwareSetup"), wo = g.createLogger({ group: "decorators", name: "fsm-injection" });
+), pr = Symbol("FutureAliases"), za = Symbol("TroubleAwareSetup"), Va = Symbol("LoggerSetup"), Ka = Symbol("ContainerAwareSetup"), Bs = Symbol("StateMachineSetup"), Es = Symbol("StateEntryHandlers"), gr = Symbol("StateExitHandlers"), EM = Symbol("StateActionHandlers"), tn = Symbol("OptionsRequired"), md = Symbol("KosViewModelSymbol"), Ga = Symbol("ViewModelConfig"), yd = Symbol("ReloadAwareSetup"), wo = m.createLogger({ group: "decorators", name: "fsm-injection" });
 function Ya(t) {
   const e = t[Bs];
   if (!e)
@@ -853,7 +853,7 @@ const CM = ({ group: t } = { group: "" }) => (e) => {
 class Qa {
   static create({ modelId: e, modelTypeName: s, component: r }) {
     const n = [r ?? "kos", s, e].filter(Boolean).join(".");
-    return g.createLogger({ name: n });
+    return m.createLogger({ name: n });
   }
 }
 function Kd(t) {
@@ -896,7 +896,7 @@ function Gd(t) {
 }
 const DM = (t) => (e, s) => {
   e[vn] = e[vn] || {}, e[vn][s] = t;
-}, wn = g.createLogger({ name: "resolve-parameters" }), be = ({
+}, wn = m.createLogger({ name: "resolve-parameters" }), be = ({
   value: t,
   modelId: e,
   modelData: s
@@ -1014,19 +1014,19 @@ function ts(t) {
     )}`;
     if (e[jt][i] = o, !t.lifecycle) {
       const c = function(...u) {
-        const d = u[u.length - 1], h = async (f) => {
-          const p = ai.get(c);
-          if (!p)
+        const d = u[u.length - 1], h = async (p) => {
+          const f = ai.get(c);
+          if (!f)
             throw new Error("Service request metadata not found for method");
           try {
-            const { default: m } = await Promise.resolve().then(() => $o), { resolvedPath: y, apiParams: v, finalBody: _, finalRequestOptions: U } = Yd(
-              p,
+            const { default: g } = await Promise.resolve().then(() => $o), { resolvedPath: y, apiParams: v, finalBody: _, finalRequestOptions: U } = Yd(
+              f,
               this,
               u,
-              f
+              p
             ), [D, $] = await Wd(
-              m,
-              p.method,
+              g,
+              f.method,
               y,
               v,
               _,
@@ -1036,23 +1036,23 @@ function ts(t) {
               return Qd(
                 D,
                 $,
-                p.errorHandler,
+                f.errorHandler,
                 this
               );
             let L = $;
-            return p.transform && (L = p.transform($)), [null, L];
-          } catch (m) {
-            return [m.message || "Unknown error", null];
+            return f.transform && (L = f.transform($)), [null, L];
+          } catch (g) {
+            return [g.message || "Unknown error", null];
           }
         };
         if (Wa(d))
           return d.$request = h, n.apply(this, u);
         {
-          const f = {
+          const p = {
             [Mo]: !0,
             $request: h
           };
-          return n.apply(this, [...u, f]);
+          return n.apply(this, [...u, p]);
         }
       };
       ai.set(c, o), r.value = c;
@@ -1061,7 +1061,7 @@ function ts(t) {
   };
 }
 var Zd = /* @__PURE__ */ ((t) => (t.GET = "GET", t.PUT = "PUT", t.POST = "POST", t.DELETE = "DELETE", t))(Zd || {}), he = /* @__PURE__ */ ((t) => (t.IMMEDIATE = "immediate", t.SINGLE = "single", t.TTL = "ttl", t.PERMANENT = "permanent", t.MANUAL = "manual", t))(he || {}), Ft = /* @__PURE__ */ ((t) => (t.ALL = "all", t.AFTER_REQUEST = "after-request", t.AFTER_RESPONSE = "after-response", t.NONE = "none", t))(Ft || {});
-const Xd = g.createLogger({ name: "kos-state-machine" });
+const Xd = m.createLogger({ name: "kos-state-machine" });
 function xM(t, e) {
   return (s) => (s.prototype[Bs] = {
     config: {
@@ -1221,7 +1221,7 @@ class _o {
       try {
         await this._future.cancelFuture();
       } catch (e) {
-        throw g.error(e), e;
+        throw m.error(e), e;
       }
   }
 }
@@ -1353,7 +1353,7 @@ const ue = "canvas-renderer", rh = "kos.declarative.futureLifecycleWrapper", _n
         return await r(e);
       } catch (o) {
         if (n.failurePolicy === "continue") {
-          g.error(`Error executing data loader for id ${t}`), g.error(o);
+          m.error(`Error executing data loader for id ${t}`), m.error(o);
           return;
         }
         throw new Mn(t, "dataLoader", o);
@@ -1377,7 +1377,7 @@ const ue = "canvas-renderer", rh = "kos.declarative.futureLifecycleWrapper", _n
         return n(e, s);
       } catch (i) {
         if (o.failurePolicy === "continue")
-          return g.error(`Error executing property mapper for id ${t}`), g.error(i), "";
+          return m.error(`Error executing property mapper for id ${t}`), m.error(i), "";
         throw new Mn(t, "propertyMapper", i);
       }
     }
@@ -1401,7 +1401,7 @@ const ue = "canvas-renderer", rh = "kos.declarative.futureLifecycleWrapper", _n
           Object.assign(n, a);
         } catch (a) {
           if (i.failurePolicy === "continue") {
-            g.error(`Error executing data mapper for id ${t}`), g.error(a);
+            m.error(`Error executing data mapper for id ${t}`), m.error(a);
             continue;
           }
           throw new Mn(t, "dataMapper", a);
@@ -1412,7 +1412,7 @@ const ue = "canvas-renderer", rh = "kos.declarative.futureLifecycleWrapper", _n
   canvas: {
     registerRenderer: (t, e) => {
       if (!M[ue]) {
-        g.warn(
+        m.warn(
           `Canvas renderer extension point is not registered. Cannot register renderer "${t}".`
         );
         return;
@@ -1496,7 +1496,7 @@ class Ja {
     }), Object.keys(s).forEach((n) => {
       const o = s[n], i = this.data[n] || [];
       if (ah(o, i))
-        g.debug(`KosContainerIndex - Index ${n} is the same`);
+        m.debug(`KosContainerIndex - Index ${n} is the same`);
       else {
         this.data[n] = o;
         const a = e.get(n) || /* @__PURE__ */ new Set();
@@ -1541,7 +1541,7 @@ function ch(t, e, s = []) {
     )
   );
 }
-const de = g.createLogger({ name: "kos-container-model" });
+const de = m.createLogger({ name: "kos-container-model" });
 class Ze {
   constructor(e) {
     l(this, "_data");
@@ -1723,13 +1723,13 @@ class Ze {
     const s = this._disposerMap.get(e.id);
     s && (s(), this._disposerMap.delete(e.id));
     const r = Object.entries(this._optionsMap || {}), n = Object.values(this._optionsMap || {}), o = new Map(r.map(([u, d]) => [d, u])), i = (u) => {
-      var h, f;
+      var h, p;
       n.includes(u.name) && ((h = this.index.get(o.get(u.name))) == null || h.refresh());
       const d = r.filter(
-        ([, p]) => typeof p == "function"
+        ([, f]) => typeof f == "function"
       );
-      for (const [p] of d)
-        (f = this.index.get(p)) == null || f.refresh();
+      for (const [f] of d)
+        (p = this.index.get(f)) == null || p.refresh();
     }, a = ch(
       e,
       i,
@@ -1925,9 +1925,9 @@ const Te = async (t) => {
   const e = T.getInstance().modelManager.getModelById(t.id);
   e && await e.fsm.transitionTo(k.UNLOAD, b.UNLOADED);
 }, jM = async (t) => {
-  await T.getInstance().whenReady(), await T.getInstance().modelManager.reloadModel(t), g.debug(
+  await T.getInstance().whenReady(), await T.getInstance().modelManager.reloadModel(t), m.debug(
     `reload model initiated for model ${t.id}, model ready: ${zn(t)} - ${Date.now()} `
-  ), await Te(t), g.debug(
+  ), await Te(t), m.debug(
     `reload model complete for model ${t.id}, model ready: ${zn(t)} - ${Date.now()}  `
   );
 }, BM = async (t) => {
@@ -1978,7 +1978,7 @@ const Te = async (t) => {
 }, li = (t, e) => {
   const s = T.getInstance().modelManager.getModelById(t);
   if (!s) {
-    g.info(`Model not found for id ${t}`);
+    m.info(`Model not found for id ${t}`);
     return;
   }
   return Array.from(s.companionModels.all()).find(
@@ -1989,7 +1989,7 @@ const Te = async (t) => {
   if (!e)
     throw new Error("Model not found");
   return e.isReady();
-}, hh = g.createLogger({ name: "kos-model-factory" }), mr = {
+}, hh = m.createLogger({ name: "kos-model-factory" }), mr = {
   byModelType: (t) => T.getInstance().modelManager.getModelFactory(
     t
   ),
@@ -2224,7 +2224,7 @@ class Ne extends ec {
     };
   }
 }
-const Vn = g.createLogger({ group: "decorators", name: "kos-model" });
+const Vn = m.createLogger({ group: "decorators", name: "kos-model" });
 function gh(t, e, s) {
   var o;
   const r = (o = t[hr]) == null ? void 0 : o.parentId;
@@ -2509,34 +2509,34 @@ function Mh(t, e) {
     "trace",
     "getCompanionParent"
     // Don't override our own getCompanionParent
-  ], u = (p) => {
-    const m = i.constructor.prototype[ne] || {};
-    return Object.values(m).some((y) => {
+  ], u = (f) => {
+    const g = i.constructor.prototype[ne] || {};
+    return Object.values(g).some((y) => {
       const v = y == null ? void 0 : y.handler;
-      return v === i[p] || v === i.constructor.prototype[p];
+      return v === i[f] || v === i.constructor.prototype[f];
     });
-  }, d = (p) => p === "constructor" || p.startsWith("_") || p.startsWith("__") || a.includes(p) || c.includes(p) || o.includes(p) || u(p) || // Exclude topic handler methods in decorator mode
-  p in t, h = /* @__PURE__ */ new Set();
-  Object.getOwnPropertyNames(i).filter((p) => !d(p)).forEach((p) => h.add(p));
-  let f = Object.getPrototypeOf(i);
-  for (; f && f !== Object.prototype; )
-    Object.getOwnPropertyNames(f).filter((p) => !d(p)).forEach((p) => h.add(p)), f = Object.getPrototypeOf(f);
-  for (const p of h)
+  }, d = (f) => f === "constructor" || f.startsWith("_") || f.startsWith("__") || a.includes(f) || c.includes(f) || o.includes(f) || u(f) || // Exclude topic handler methods in decorator mode
+  f in t, h = /* @__PURE__ */ new Set();
+  Object.getOwnPropertyNames(i).filter((f) => !d(f)).forEach((f) => h.add(f));
+  let p = Object.getPrototypeOf(i);
+  for (; p && p !== Object.prototype; )
+    Object.getOwnPropertyNames(p).filter((f) => !d(f)).forEach((f) => h.add(f)), p = Object.getPrototypeOf(p);
+  for (const f of h)
     try {
-      const m = i[p];
-      typeof m == "function" ? t[p] = (...y) => m.apply(i, y) : Object.defineProperty(t, p, {
-        get: () => i[p],
+      const g = i[f];
+      typeof g == "function" ? t[f] = (...y) => g.apply(i, y) : Object.defineProperty(t, f, {
+        get: () => i[f],
         set: (y) => {
-          i[p] = y;
+          i[f] = y;
         },
         enumerable: !0,
         configurable: !0
         // Allow MobX to make this observable
       });
-    } catch (m) {
+    } catch (g) {
       Vn.debug(
-        `Skipping companion proxy for property ${p}:`,
-        m
+        `Skipping companion proxy for property ${f}:`,
+        g
       );
     }
 }
@@ -2571,7 +2571,7 @@ const $h = {
     var c;
     const [s, r = {}] = e, n = J.createContext(s);
     gh(t, s, r);
-    const i = !!t.prototype[Va] ? null : g.createLogger({
+    const i = !!t.prototype[Va] ? null : m.createLogger({
       name: t.prototype.modelTypeId,
       group: ((c = t[fr]) == null ? void 0 : c.group) ?? "kos-model"
     }), a = new t(s, r, {
@@ -2585,8 +2585,8 @@ function R(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[Ba] = !0, (o = s.prototype)[ne] ?? (o[ne] = {}), (i = s.prototype)[N] ?? (i[N] = {}), r.optionsRequired && (s.prototype[tn] = !0), g.ifDebug(() => {
-      g.debug(`Registering model with id ${r.modelTypeId}`);
+    s.prototype.modelTypeId = r.modelTypeId, s.prototype[Ba] = !0, (o = s.prototype)[ne] ?? (o[ne] = {}), (i = s.prototype)[N] ?? (i[N] = {}), r.optionsRequired && (s.prototype[tn] = !0), m.ifDebug(() => {
+      m.debug(`Registering model with id ${r.modelTypeId}`);
     });
     const n = new Proxy(s, $h);
     if (r.singleton !== void 0) {
@@ -2665,18 +2665,18 @@ function Ch(t, e) {
     destinationAddress: u,
     debounce: d,
     throttle: h,
-    buffer: f,
-    filter: p,
-    once: m,
+    buffer: p,
+    filter: f,
+    once: g,
     wildcardName: y,
     flow: v,
     requiresBaseline: _
   } = t, U = e.value, D = Dh(U, {
     debounce: d,
     throttle: h,
-    buffer: f,
-    once: m
-  }), $ = xh(p, s);
+    buffer: p,
+    once: g
+  }), $ = xh(f, s);
   return {
     websocket: n,
     fos: o,
@@ -2690,7 +2690,7 @@ function Ch(t, e) {
     wildcardName: y,
     flow: v,
     requiresBaseline: _,
-    once: m
+    once: g
   };
 }
 function Dh(t, e) {
@@ -2808,12 +2808,12 @@ function Kh(t, e) {
     return;
   const s = t[et], r = [];
   for (const a of Object.keys(s)) {
-    const { value: c, dependencies: u, options: d } = s[a], h = c.bind(t), f = () => {
+    const { value: c, dependencies: u, options: d } = s[a], h = c.bind(t), p = () => {
       Z(() => h());
-    }, p = u ? Jt(() => u(t), f, {
+    }, f = u ? Jt(() => u(t), p, {
       fireImmediately: !!(d != null && d.fireImmediately)
-    }) : Xt(f);
-    r.push(p);
+    }) : Xt(p);
+    r.push(f);
   }
   Object.defineProperty(t, zh, {
     value: r,
@@ -2893,7 +2893,7 @@ const Dn = /* @__PURE__ */ new Map(), tc = {
       clearTimeout(s);
     });
   }
-}, Qh = g.createLogger({ name: "kos-dependency-manager" });
+}, Qh = m.createLogger({ name: "kos-dependency-manager" });
 class Zh {
   constructor() {
     l(this, "_usedByCache", /* @__PURE__ */ new Map());
@@ -2926,7 +2926,7 @@ class Zh {
     this._usedByCache.clear(), this._usesCache.clear();
   }
 }
-const di = g.createLogger({ name: "kos-model-cache" });
+const di = m.createLogger({ name: "kos-model-cache" });
 class Xh {
   constructor(e = []) {
     l(this, "_modelsById", te.map(/* @__PURE__ */ new Map()));
@@ -3005,9 +3005,9 @@ function Bt(t, e) {
   );
 }
 function Jh(t, e) {
-  t.length !== 0 && (g.error(`${e} - ${t.length} error(s) occurred:`), t.forEach(({ error: s, context: r }, n) => {
+  t.length !== 0 && (m.error(`${e} - ${t.length} error(s) occurred:`), t.forEach(({ error: s, context: r }, n) => {
     const o = s instanceof yr ? s : Bt(s, r);
-    g.error(
+    m.error(
       `  [${n + 1}/${t.length}] ${o.toDetailedString()}`
     );
   }));
@@ -3022,7 +3022,7 @@ function hi(t, e) {
     timestamp: (/* @__PURE__ */ new Date()).toISOString()
   });
 }
-const ef = (t) => typeof t == "function", Zs = g.createLogger({ name: "kos-companion-instantiator" });
+const ef = (t) => typeof t == "function", Zs = m.createLogger({ name: "kos-companion-instantiator" });
 class tf {
   constructor(e, s, r) {
     this.registry = e, this.cache = s, this.createModel = r;
@@ -3204,7 +3204,7 @@ const nc = (t, e, s) => {
   let r;
   return { promise: new Promise((i, a) => {
     r = setTimeout(() => {
-      g.error(
+      m.error(
         `Model ${e.modelId} - ${e.modelTypeName} - ${s} timed out after ${t}ms`
       ), a(
         new uf(
@@ -3228,46 +3228,46 @@ const nc = (t, e, s) => {
       return t.filter(br);
   }
 }, hf = (t, e) => {
-  var f;
+  var p;
   const s = e.id || e.modelType, r = be({
     value: s,
     modelData: t.modelData,
     modelId: t.modelId
   }), n = e.resolutionPolicy || ht.CREATE;
-  g.debug(
+  m.debug(
     `Resolving dependent model ${e.modelType} with id ${r} (policy: ${n})`
   );
-  const o = Object.keys((e == null ? void 0 : e.options) || {}).reduce((p, m) => {
-    const y = e.options[m];
-    return p[m] = be({
+  const o = Object.keys((e == null ? void 0 : e.options) || {}).reduce((f, g) => {
+    const y = e.options[g];
+    return f[g] = be({
       value: y,
       modelData: t.modelData,
       modelId: t.modelId
-    }), p;
+    }), f;
   }, {}), i = T.getInstance().modelManager, a = i.registry.models[e.modelType];
   if (!a) {
-    const p = `No model registered for type ${e.modelType}`;
-    if (g.error(
+    const f = `No model registered for type ${e.modelType}`;
+    if (m.error(
       `Failed to resolve dependency for model ${t.modelId}:
   - Dependency Type: ${e.modelType}
   - Dependency ID: ${r}
   - Resolution Policy: ${n}
   - Parent Model: ${t.modelTypeName}
   - Parent Model ID: ${t.modelId}
-  - Error: ${p}`
+  - Error: ${f}`
     ), n === ht.CONTINUE)
-      return g.warn(
+      return m.warn(
         `Model type not registered (policy: CONTINUE) - Model ${t.modelId} will continue without dependency ${e.modelType} [${r}]`
       ), { dependentModel: null, dataModelId: r, success: !1 };
     throw new Error(
-      `Dependency resolution failed - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${p}`
+      `Dependency resolution failed - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${f}`
     );
   }
   const c = i.getModelById(r);
   if (c) {
     if (c.modelTypeName !== e.modelType) {
-      const p = `Model type mismatch: expected ${e.modelType}, found ${c.modelTypeName}`;
-      if (g.error(
+      const f = `Model type mismatch: expected ${e.modelType}, found ${c.modelTypeName}`;
+      if (m.error(
         `Failed to resolve dependency for model ${t.modelId}:
   - Dependency Type: ${e.modelType}
   - Dependency ID: ${r}
@@ -3275,16 +3275,16 @@ const nc = (t, e, s) => {
   - Parent Model: ${t.modelTypeName}
   - Parent Model ID: ${t.modelId}
   - Found Model Type: ${c.modelTypeName}
-  - Error: ${p}`
+  - Error: ${f}`
       ), n === ht.CONTINUE)
-        return g.warn(
+        return m.warn(
           `Model type mismatch (policy: CONTINUE) - Model ${t.modelId} will continue without dependency`
         ), { dependentModel: null, dataModelId: r, success: !1 };
       throw new Error(
-        `Dependency resolution failed - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${p}`
+        `Dependency resolution failed - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${f}`
       );
     }
-    return g.debug(
+    return m.debug(
       `Found existing dependent model ${e.modelType} with id ${r}`
     ), {
       dependentModel: { model: c, data: c.modelData },
@@ -3292,16 +3292,16 @@ const nc = (t, e, s) => {
       success: !0
     };
   }
-  if (g.debug(
+  if (m.debug(
     `Model ${e.modelType} [${r}] does not exist. Applying resolution policy: ${n}`
   ), n === ht.CONTINUE)
-    return g.warn(
+    return m.warn(
       `Model ${e.modelType} [${r}] not found (policy: CONTINUE) - Model ${t.modelId} will continue without this dependency`
     ), { dependentModel: null, dataModelId: r, success: !1 };
   const u = Object.keys(o).length > 0, d = a.class || a.create;
-  if (((f = d == null ? void 0 : d.prototype) == null ? void 0 : f[tn]) === !0 && !u) {
-    const p = `Model ${e.modelType} requires options but none were provided`;
-    throw g.error(
+  if (((p = d == null ? void 0 : d.prototype) == null ? void 0 : p[tn]) === !0 && !u) {
+    const f = `Model ${e.modelType} requires options but none were provided`;
+    throw m.error(
       `Failed to resolve dependency for model ${t.modelId}:
   - Dependency Type: ${e.modelType}
   - Dependency ID: ${r}
@@ -3309,24 +3309,24 @@ const nc = (t, e, s) => {
   - Parent Model: ${t.modelTypeName}
   - Parent Model ID: ${t.modelId}
   - Provided Options: ${JSON.stringify(o, null, 2)}
-  - Error: ${p}
+  - Error: ${f}
   - Model requires options but dependency declaration provides none`
     ), new Error(
-      `Dependency resolution failed - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${p}. Use resolutionPolicy: DependencyResolutionPolicy.CONTINUE if this dependency is optional.`
+      `Dependency resolution failed - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${f}. Use resolutionPolicy: DependencyResolutionPolicy.CONTINUE if this dependency is optional.`
     );
   }
   try {
-    const p = T.getInstance().modelManager.createModelInstance(
+    const f = T.getInstance().modelManager.createModelInstance(
       e.modelType,
       r,
       o
     );
-    return g.debug(
+    return m.debug(
       `Successfully created dependent model ${e.modelType} with id ${r}`
-    ), { dependentModel: p, dataModelId: r, success: !0 };
-  } catch (p) {
-    const m = p instanceof Error ? p.message : String(p);
-    throw g.error(
+    ), { dependentModel: f, dataModelId: r, success: !0 };
+  } catch (f) {
+    const g = f instanceof Error ? f.message : String(f);
+    throw m.error(
       `Failed to create dependency for model ${t.modelId}:
   - Dependency Type: ${e.modelType}
   - Dependency ID: ${r}
@@ -3334,37 +3334,37 @@ const nc = (t, e, s) => {
   - Parent Model: ${t.modelTypeName}
   - Parent Model ID: ${t.modelId}
   - Provided Options: ${JSON.stringify(o, null, 2)}
-  - Error: ${m}`
+  - Error: ${g}`
     ), n === ht.FAIL ? new Error(
-      `Dependency resolution failed (policy: FAIL) - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${m}`
-    ) : p;
+      `Dependency resolution failed (policy: FAIL) - Model ${t.modelId} cannot resolve dependency ${e.modelType} [${r}]: ${g}`
+    ) : f;
   }
 }, ff = (t, e = O.READY) => {
   var n;
   const s = ((n = t.modelData) == null ? void 0 : n[N]) || {};
-  return Object.keys(s).length === 0 ? (g.debug(`${t.modelId} has no dependencies.  Returning`), []) : Object.keys(s).filter((o) => s[o].lifecycle === e).map((o) => {
+  return Object.keys(s).length === 0 ? (m.debug(`${t.modelId} has no dependencies.  Returning`), []) : Object.keys(s).filter((o) => s[o].lifecycle === e).map((o) => {
     const i = s[o], a = hf(t, i);
     if (!a.success || !a.dependentModel)
-      return g.debug(
+      return m.debug(
         `Skipping dependency ${i.modelType} with id ${a.dataModelId} - resolution failed with CONTINUE policy`
       ), t.modelData[o] = void 0, null;
     const { dependentModel: c, dataModelId: u } = a;
-    t.modelData[o] = c.data, g.debug(
+    t.modelData[o] = c.data, m.debug(
       `waiting for dependent model ${i.modelType} with id ${u} - waiting for WHENREADY`
     );
-    const d = async (p, m, y) => {
+    const d = async (f, g, y) => {
       var v;
-      await ((v = p.whenReady) == null ? void 0 : v.call(p)), g.debug(`dependent model ${m} with id ${y} - READY`);
-    }, { promise: h, cancel: f } = nc(
+      await ((v = f.whenReady) == null ? void 0 : v.call(f)), m.debug(`dependent model ${g} with id ${y} - READY`);
+    }, { promise: h, cancel: p } = nc(
       sc,
       t,
       t.status
     );
     return Promise.race([
       d(c.model, i.modelType, u).then(() => {
-        f();
-      }).catch((p) => {
-        const m = Bt(p, {
+        p();
+      }).catch((f) => {
+        const g = Bt(f, {
           modelType: i.modelType,
           modelId: u,
           parentModel: {
@@ -3374,25 +3374,25 @@ const nc = (t, e, s) => {
           lifecycle: e,
           operation: "dependency whenReady()"
         });
-        throw g.error(m.toDetailedString()), f(), m;
+        throw m.error(g.toDetailedString()), p(), g;
       }),
       h
     ]);
   }).filter((o) => !!o);
 }, pf = async (t, e, s, r) => {
-  if (g.debug(`Execute lifecycle with ${e.length} models`), e.length === 0) {
-    g.debug(`${t.modelId} has no children.  Returning`);
+  if (m.debug(`Execute lifecycle with ${e.length} models`), e.length === 0) {
+    m.debug(`${t.modelId} has no children.  Returning`);
     return;
   }
   if (!s) {
-    g.error(
+    m.error(
       `${t.modelId} is not transitioning with a valid target ${s}`
     );
     return;
   }
   const n = e.map((a) => {
     let c;
-    return An[s] && a ? c = An[s](a) : (a || g.error("model is undefined.  This shouldn't happen"), An[s] || g.error(
+    return An[s] && a ? c = An[s](a) : (a || m.error("model is undefined.  This shouldn't happen"), An[s] || m.error(
       `There is no promise in the Transition Map for ${s}`
     )), {
       promise: c,
@@ -3401,7 +3401,7 @@ const nc = (t, e, s) => {
       type: a == null ? void 0 : a.modelTypeName,
       status: a == null ? void 0 : a.status
     };
-  }).filter((a) => a.promise ? a.model ? !0 : (g.error(`No model found ${a.modelId}`), !1) : (g.error(`No promise found ${a.modelId}`), !1)), o = await Promise.allSettled(
+  }).filter((a) => a.promise ? a.model ? !0 : (m.error(`No model found ${a.modelId}`), !1) : (m.error(`No promise found ${a.modelId}`), !1)), o = await Promise.allSettled(
     n.map((a) => {
       var d;
       if (!a.model || !a.status)
@@ -3415,7 +3415,7 @@ const nc = (t, e, s) => {
         (d = a.promise) == null ? void 0 : d.then(() => {
           u();
         }).catch((h) => {
-          const f = Bt(h, {
+          const p = Bt(h, {
             modelType: a.type || "unknown",
             modelId: a.modelId,
             parentModel: {
@@ -3425,7 +3425,7 @@ const nc = (t, e, s) => {
             lifecycle: r,
             operation: `transition to ${s}`
           });
-          throw g.error(f.toDetailedString()), u(), f;
+          throw m.error(p.toDetailedString()), u(), p;
         }),
         c
       ]);
@@ -3464,9 +3464,9 @@ const nc = (t, e, s) => {
   const r = (await Promise.allSettled(
     ff(t, e)
   )).filter((n) => n.status === "rejected");
-  r.length && (g.error(
+  r.length && (m.error(
     `There were ${r.length} failed dependent models on ${e}`
-  ), g.error(r));
+  ), m.error(r));
 };
 function mf(t) {
   const e = `KosModel(${t.modelTypeName}:${t.modelId})`;
@@ -3567,22 +3567,22 @@ function yf(t, e, s, r) {
           const d = t[ne] || {}, h = Object.keys(d);
           return h.length === 0 ? { count: 0, data: [] } : {
             count: h.length,
-            data: h.map((f) => {
-              const p = d[f];
+            data: h.map((p) => {
+              const f = d[p];
               return {
-                topic: f,
-                websocket: !!p.websocket,
-                ...p.lifecycle && { lifecycle: p.lifecycle },
-                ...p.fos && { fos: !0 },
-                ...p.bridge && { bridge: !0 },
-                ...p.destinationAddress && {
-                  destinationAddress: p.destinationAddress
+                topic: p,
+                websocket: !!f.websocket,
+                ...f.lifecycle && { lifecycle: f.lifecycle },
+                ...f.fos && { fos: !0 },
+                ...f.bridge && { bridge: !0 },
+                ...f.destinationAddress && {
+                  destinationAddress: f.destinationAddress
                 },
-                ...p.wildcardName && {
-                  wildcardName: p.wildcardName
+                ...f.wildcardName && {
+                  wildcardName: f.wildcardName
                 },
-                ...p.flow && { flow: !0 },
-                ...p.requiresBaseline && { requiresBaseline: !0 }
+                ...f.flow && { flow: !0 },
+                ...f.requiresBaseline && { requiresBaseline: !0 }
               };
             })
           };
@@ -3691,7 +3691,7 @@ class wf {
     this.disposers = [];
   }
 }
-const Ef = g.createLogger({ name: "model-active-machine" }), Mf = (t) => {
+const Ef = m.createLogger({ name: "model-active-machine" }), Mf = (t) => {
   const e = _s(b.INACTIVE, {
     [b.FAILED]: X(
       x(k.GO_ACTIVE, b.ACTIVATING)
@@ -3741,7 +3741,7 @@ const Ef = g.createLogger({ name: "model-active-machine" }), Mf = (t) => {
     e,
     (r) => Ef.debug(r.machine.current)
   ), machine: e };
-}, fi = g.createLogger({ name: "model-online-machine" }), _f = (t) => {
+}, fi = m.createLogger({ name: "model-online-machine" }), _f = (t) => {
   const e = _s(b.OFFLINE, {
     [b.ONLINE]: X(
       x(
@@ -3792,7 +3792,7 @@ const Ef = g.createLogger({ name: "model-active-machine" }), Mf = (t) => {
         "error",
         b.FAILED,
         V(() => {
-          g.error(
+          m.error(
             `Model ${t.modelId} - ${t.modelTypeName} failed to initialize.  Transitioning to FAILED state.`
           ), t.status = b.FAILED;
         })
@@ -3897,7 +3897,7 @@ const Ef = g.createLogger({ name: "model-active-machine" }), Mf = (t) => {
     [b.UNLOADED]: X(),
     [b.FAILED]: X()
   });
-}, $f = g.createLogger({ name: "kos-model-lifecycle" }), Sf = (t) => ({ service: Ts(
+}, $f = m.createLogger({ name: "kos-model-lifecycle" }), Sf = (t) => ({ service: Ts(
   Tf(t),
   (s) => $f.debug(
     `state machine for model ${t.modelId}: ${s.machine.current});`
@@ -4508,7 +4508,7 @@ const Bf = ({
     Hf(e),
     typeof s == "string" ? s : JSON.stringify(s)
   ), n = T.getInstance().transport.socket;
-  n ? (g.debug("Sending message", r), n.socket.send(r)) : g.error("socket transport is not initialized");
+  n ? (m.debug("Sending message", r), n.socket.send(r)) : m.error("socket transport is not initialized");
 }, qf = ({
   path: t,
   responseId: e,
@@ -4529,13 +4529,13 @@ const Bf = ({
     Bf(e),
     JSON.stringify(s)
   ), n = T.getInstance().transport.socket;
-  n ? n.socket.send(r) : g.error("socket transport is not initialized");
+  n ? n.socket.send(r) : m.error("socket transport is not initialized");
 }, JM = (t, e) => {
   const s = e.responseId ? { status: e.status, data: t } : t, r = $t(
     qf(e),
     JSON.stringify(s)
   ), n = T.getInstance().transport.socket;
-  n ? n.socket.send(r) : g.error("socket transport is not initialized");
+  n ? n.socket.send(r) : m.error("socket transport is not initialized");
 }, zf = ({
   topic: t
 }) => {
@@ -4582,7 +4582,7 @@ const Bf = ({
     zf(e),
     JSON.stringify(s)
   ), n = T.getInstance().transport.socket;
-  n ? n.socket.send(r) : g.error("socket transport is not initialized");
+  n ? n.socket.send(r) : m.error("socket transport is not initialized");
 }, Gf = ({
   msg: t,
   options: e
@@ -4591,7 +4591,7 @@ const Bf = ({
     Kf(e),
     JSON.stringify(s)
   ), n = T.getInstance().transport.socket;
-  n ? n.socket.send(r) : g.error("socket transport is not initialized");
+  n ? n.socket.send(r) : m.error("socket transport is not initialized");
 }, Yf = ({
   msg: t,
   options: e
@@ -4600,14 +4600,14 @@ const Bf = ({
     Vf(e),
     JSON.stringify(s)
   ), n = T.getInstance().transport.socket;
-  n ? n.socket.send(r) : g.error("socket transport is not initialized");
+  n ? n.socket.send(r) : m.error("socket transport is not initialized");
 }, pi = (t, e) => {
   try {
     return e ? t.body ?? t : JSON.parse(t.body);
   } catch {
     return t.body || t;
   }
-}, at = g.createLogger({ name: "kos-fetch" }), Wf = process.env.KOS_WS_TIMEOUT ? parseInt(process.env.KOS_WS_TIMEOUT) : 3e4, Qf = () => new Promise((t) => {
+}, at = m.createLogger({ name: "kos-fetch" }), Wf = process.env.KOS_WS_TIMEOUT ? parseInt(process.env.KOS_WS_TIMEOUT) : 3e4, Qf = () => new Promise((t) => {
   setTimeout(() => {
     t(!0);
   }, 0);
@@ -4639,7 +4639,7 @@ const Bf = ({
   at.debug(`path: ${o}`);
   const i = (e == null ? void 0 : e.timeout) || Wf, a = Jf(e), c = Zf(i), u = e != null && e.signal ? Xf([e.signal, c]) : c, d = await kf(e == null ? void 0 : e.body), h = {};
   d.contentType && (h["content-type"] = d.contentType), d.encoding && (h["content-encoding"] = d.encoding);
-  const f = $t(
+  const p = $t(
     a({
       path: o,
       requestId: r,
@@ -4652,17 +4652,17 @@ const Bf = ({
     }),
     d.data
   );
-  return new Promise((p, m) => {
+  return new Promise((f, g) => {
     let y = null;
     if (u.aborted) {
       const D = u.reason;
-      (D == null ? void 0 : D.name) === "TimeoutError" ? at.error(`Timeout occurred - url: ${t}`) : at.debug(`Request aborted - url: ${t}`), m(D || new DOMException("Aborted", "AbortError"));
+      (D == null ? void 0 : D.name) === "TimeoutError" ? at.error(`Timeout occurred - url: ${t}`) : at.debug(`Request aborted - url: ${t}`), g(D || new DOMException("Aborted", "AbortError"));
       return;
     }
     const v = () => {
       y && y();
       const D = u.reason;
-      (D == null ? void 0 : D.name) === "TimeoutError" ? at.error(`Timeout occurred - url: ${t}`) : at.debug(`Request aborted - url: ${t}`), m(D || new DOMException("Aborted", "AbortError"));
+      (D == null ? void 0 : D.name) === "TimeoutError" ? at.error(`Timeout occurred - url: ${t}`) : at.debug(`Request aborted - url: ${t}`), g(D || new DOMException("Aborted", "AbortError"));
     };
     u.addEventListener("abort", v, { once: !0 });
     const _ = I(r, (D) => {
@@ -4727,13 +4727,13 @@ const Bf = ({
         },
         bodyUsed: !1
       };
-      _.unsubscribe(), Qf().then(() => p(us));
+      _.unsubscribe(), Qf().then(() => f(us));
     });
     y = _.unsubscribe;
     const U = e != null && e.fos ? s.fosSocket : s.socket;
     if (!U)
       throw Error(`No web socket transport available: ${e}`);
-    U == null || U.send(f);
+    U == null || U.send(p);
   });
 };
 let we = "kos:", Ue = ep;
@@ -4741,7 +4741,7 @@ if (process.env.KOS_MOCK_FETCH === "true") {
   const t = process.env.KOS_PORT || "9999";
   Ue = fetch, we = `http://localhost:${t}`;
 }
-const tp = () => ({ isMock: !1, URL: we }), Js = g.createLogger({ name: "kos-service-request" }), gi = "errUnknown";
+const tp = () => ({ isMock: !1, URL: we }), Js = m.createLogger({ name: "kos-service-request" }), gi = "errUnknown";
 async function er(t, e, s, r, n) {
   const o = r != null && r.path ? Object.keys(r.path).reduce(
     (u, d) => String(u).replace(`{${d}}`, r == null ? void 0 : r.path[d]),
@@ -4788,7 +4788,7 @@ function ot() {
 const je = ot(), $o = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: je
-}, Symbol.toStringTag, { value: "Module" })), ut = g.createLogger({
+}, Symbol.toStringTag, { value: "Module" })), ut = m.createLogger({
   name: "kos-service-request-manager",
   group: "Model"
 });
@@ -5265,10 +5265,10 @@ class fp {
           for (this.enqueueEvent(u); this.eventQueue.length > 0; ) {
             const d = this.dequeueEvent();
             d && o.push(d);
-            const f = Date.now() - i;
-            if (o.length >= r || f >= n) {
-              const p = await a();
-              p !== void 0 && (yield p);
+            const p = Date.now() - i;
+            if (o.length >= r || p >= n) {
+              const f = await a();
+              f !== void 0 && (yield f);
               break;
             }
           }
@@ -5276,8 +5276,8 @@ class fp {
           o.push(u);
           const h = Date.now() - i;
           if (o.length >= r || h >= n) {
-            const f = await a();
-            f !== void 0 && (yield f);
+            const p = await a();
+            p !== void 0 && (yield p);
           }
         }
       const c = await a();
@@ -5417,7 +5417,7 @@ const Ie = class Ie {
     ), this.socket.onmessage = this.onMessage.bind(this), this.socket.onopen = this.onOpen.bind(this), this.socket.onclose = this.onClose.bind(this), this.socket.onerror = this.onError.bind(this), this.oldSend = this.socket.send, this.connectionEstablished = !1, I("/mock/msg/receive", (c) => {
       var u, d;
       if (c != null && c.body) {
-        g.wsReceive(c == null ? void 0 : c.body);
+        m.wsReceive(c == null ? void 0 : c.body);
         const h = {
           data: c.body
         };
@@ -5436,9 +5436,9 @@ const Ie = class Ie {
   }
   onMessage(e) {
     try {
-      g.debug("webSocketTransport: onMessage received");
+      m.debug("webSocketTransport: onMessage received");
       const { headers: s, body: r } = this.processMessageEvent(e);
-      g.wsReceive(e.data);
+      m.wsReceive(e.data);
       const n = s.subscription || s[this.RESPONSE_ID_HEADER] || s.topic || s.type;
       if (n) {
         let o = r, i = s;
@@ -5452,26 +5452,26 @@ const Ie = class Ie {
         H(n, o, i);
       }
     } catch (s) {
-      g.error("onMessage exception", s.message, s.stack);
+      m.error("onMessage exception", s.message, s.stack);
     }
   }
   onOpen(e) {
-    g.info("websocket connection opened"), this.reconnectAttempts = 0, this.socket = e.currentTarget, Z(() => {
+    m.info("websocket connection opened"), this.reconnectAttempts = 0, this.socket = e.currentTarget, Z(() => {
       var s;
       this.connectionEstablished = !0, this.alias && this.socket.send(`type:kos.addr.alias
 alias:${this.alias}
 
-`), g.debug(
+`), m.debug(
         `sending ${this.offlineMessages.length} offline FOS messages`
       ), this.offlineMessages.forEach((r) => {
         var n;
-        g.debug(`sending offline message ${r.msg}`), (n = this.socket) == null || n.send(r.msg);
+        m.debug(`sending offline message ${r.msg}`), (n = this.socket) == null || n.send(r.msg);
       }), this.offlineMessages = [], (s = this.onConnectionEstablished) == null || s.call(this);
     });
   }
   onClose(e) {
     const { code: s, reason: r, wasClean: n } = e;
-    g.warn(
+    m.warn(
       `WebSocket closed: code=${s}, reason=${r || "none"}, wasClean=${n}`
     ), Z(() => {
       this.connectionEstablished = !1;
@@ -5480,23 +5480,23 @@ alias:${this.alias}
     if (this.onConnectionLost)
       if (o && this.reconnectAttempts < Ie.MAX_RECONNECT_ATTEMPTS) {
         const i = this.calculateBackoffDelay();
-        g.debug(
+        m.debug(
           `Reconnecting in ${i}ms (attempt ${this.reconnectAttempts + 1}/${Ie.MAX_RECONNECT_ATTEMPTS})`
         ), setTimeout(() => {
           var a;
           this.reconnectAttempts++, (a = this.onConnectionLost) == null || a.call(this);
         }, i);
       } else
-        this.reconnectAttempts >= Ie.MAX_RECONNECT_ATTEMPTS ? (g.error(
+        this.reconnectAttempts >= Ie.MAX_RECONNECT_ATTEMPTS ? (m.error(
           `Max reconnection attempts (${Ie.MAX_RECONNECT_ATTEMPTS}) reached. Giving up.`
         ), H("websocket.max_retries_exceeded", {
           attempts: this.reconnectAttempts
-        })) : g.info(
+        })) : m.info(
           `Not reconnecting due to close code ${s} (intentional close or configuration error)`
         );
   }
   onError(e) {
-    g.error("websocket error: ", e), H("websocket.error", { event: e });
+    m.error("websocket error: ", e), H("websocket.error", { event: e });
   }
   /**
    * Determines whether to attempt reconnection based on WebSocket close code.
@@ -5553,7 +5553,7 @@ alias:${this.alias}
   }
   send(e) {
     var s, r;
-    if (g.wsSend(e), window.kosLogEvents) {
+    if (m.wsSend(e), window.kosLogEvents) {
       const { headers: n, body: o } = yi(String(e));
       H(Zr.SEND, { headers: n, body: o });
     }
@@ -5689,9 +5689,9 @@ class bi {
     onConnectionEstablished: i,
     onConnectionLost: a
   }) {
-    return g.debug("initializing websocket connection"), g.warn(
+    return m.debug("initializing websocket connection"), m.warn(
       `kosWindowWebsocketOpen: ${globalThis.kosWindowWebsocketOpen ? "true" : "false"}`
-    ), g.warn(`fos: ${n ? "true" : "false"}`), window.kosMockWs || globalThis.kosWindowWebsocketOpen && !n ? (g.warn("Using bridged message transport"), new yp({
+    ), m.warn(`fos: ${n ? "true" : "false"}`), window.kosMockWs || globalThis.kosWindowWebsocketOpen && !n ? (m.warn("Using bridged message transport"), new yp({
       host: e,
       port: s,
       protocol: r,
@@ -5766,7 +5766,7 @@ class Is {
   }
   init() {
     var e, s;
-    if (g.warn(`Initializing WebSocketTransport on ${this.host}:${this.port}`), this.useFosTransport && (this.fosSocket = bi.build({
+    if (m.warn(`Initializing WebSocketTransport on ${this.host}:${this.port}`), this.useFosTransport && (this.fosSocket = bi.build({
       host: this.host,
       port: this.fosPort || 9854,
       protocol: this.protocol,
@@ -5791,9 +5791,9 @@ class Is {
     return this;
   }
   _sendSubscriptionMessage(e, s, r = !1, n = !1, o) {
-    var f, p, m, y;
+    var p, f, g, y;
     ct.debug(`${s} to topic ${e}`);
-    const i = $e(), a = i == null ? void 0 : i.connId, c = o ?? a ?? ((f = window == null ? void 0 : window.kosBridge) == null ? void 0 : f.call(window, "connId"));
+    const i = $e(), a = i == null ? void 0 : i.connId, c = o ?? a ?? ((p = window == null ? void 0 : window.kosBridge) == null ? void 0 : p.call(window, "connId"));
     ct.debug(`subscribing with connId ${c}`);
     const u = c ? `dst-addr:${c}
 ` : "", d = r ? `subscribe:${e}` : n ? `type:fos.broker
@@ -5802,7 +5802,7 @@ ${u}topics:${e}
 ` : `${u}type:kos.broker.${s}
 
 ["${e}"]`;
-    if (r ? (p = this.fosSocket) == null ? void 0 : p.connectionEstablished : (m = this.socket) == null ? void 0 : m.connectionEstablished) {
+    if (r ? (f = this.fosSocket) == null ? void 0 : f.connectionEstablished : (g = this.socket) == null ? void 0 : g.connectionEstablished) {
       const v = r ? this.fosSocket : this.socket;
       (y = v == null ? void 0 : v.socket) == null || y.send(d);
     } else {
@@ -5973,42 +5973,42 @@ class Mp {
   }
   createHandler(e, s) {
     return async (r) => {
-      var n;
+      var n, o;
       try {
-        const o = (n = r == null ? void 0 : r.headers) == null ? void 0 : n["src-addr"], i = s.destinationAddress && this.resolvePropKey(s.destinationAddress), a = i ? o === i : !0, c = this.extractWildcardCapture(
+        const i = (n = r == null ? void 0 : r.headers) == null ? void 0 : n["src-alias"], a = (o = r == null ? void 0 : r.headers) == null ? void 0 : o["src-addr"], c = s.destinationAddress && this.resolvePropKey(s.destinationAddress), u = c ? !!(i && i === c || a === c) : !0, d = this.extractWildcardCapture(
           e,
           r,
           s
-        ), u = this.isBaselineReady(e);
-        if (!this.model.isReady() || !u) {
-          u ? this.log.warn(
+        ), h = this.isBaselineReady(e);
+        if (!this.model.isReady() || !h) {
+          h ? this.log.warn(
             `Model ${this.modelId} not ready. Queuing message for ${e}`
           ) : this.log.warn(
             `Baseline not ready for ${e}. Queuing message.`
           );
-          const d = () => {
-            const h = pi(r, s.skipParse), f = s.transform(h);
-            if (a && s.condition(f, this.modelData, r))
+          const p = () => {
+            const f = pi(r, s.skipParse), g = s.transform(f);
+            if (u && s.condition(g, this.modelData, r))
               return this.callHandlerWithWildcard(
                 s,
-                f,
-                c,
+                g,
+                d,
                 r
               );
           };
-          this.offlineQueue.enqueue(d, e, r);
+          this.offlineQueue.enqueue(p, e, r);
         } else {
-          const d = pi(r, s.skipParse), h = s.transform(d);
-          if (a && s.condition(h, this.modelData, r))
+          const p = pi(r, s.skipParse), f = s.transform(p);
+          if (u && s.condition(f, this.modelData, r))
             return this.callHandlerWithWildcard(
               s,
-              h,
-              c,
+              f,
+              d,
               r
             );
         }
-      } catch (o) {
-        this.log.error(`Error handling subscription for ${e}`, o);
+      } catch (i) {
+        this.log.error(`Error handling subscription for ${e}`, i);
       }
     };
   }
@@ -6525,13 +6525,13 @@ class xp {
       n,
       Dt(o, "effect")
     )), Tp(n)) {
-      const f = Dt(o, "subscription");
+      const p = Dt(o, "subscription");
       h.subscriptionManager = new Mp(
         e,
         n,
         s,
         a,
-        f
+        p
       ), h.onlineLifecycleManager = new Cf(
         e,
         Dt(o, "online")
@@ -6750,13 +6750,13 @@ class Pp {
     this._isLoadExecuting = !0;
     try {
       F.debug(`Loading model ${s} with id ${r}`), await Xs(this, O.LOAD);
-      const d = J.getContext(r), h = `${Ap}.${s}`, f = await M.loader.executeLoader(
+      const d = J.getContext(r), h = `${Ap}.${s}`, p = await M.loader.executeLoader(
         h,
         {}
       );
-      f && (F.info(
+      p && (F.info(
         `Setting loaded context for ${r}, type: ${s}`
-      ), d == null || d.set(h, f)), await ((n = this.serviceRequestManager) == null ? void 0 : n.executeForLifecycle(
+      ), d == null || d.set(h, p)), await ((n = this.serviceRequestManager) == null ? void 0 : n.executeForLifecycle(
         O.LOAD
       )), await ((i = (o = this.modelData) == null ? void 0 : o.load) == null ? void 0 : i.call(o, d)), ae(() => {
         this.loaded = !0;
@@ -6853,7 +6853,7 @@ class Pp {
     this.companionManager.clear();
   }
 }
-const Pn = g.createLogger({ name: "kos-model-instantiator" });
+const Pn = m.createLogger({ name: "kos-model-instantiator" });
 class Rp {
   constructor(e, s) {
     l(this, "companionInstantiator");
@@ -6904,12 +6904,12 @@ class Rp {
         });
       }
       try {
-        const h = n.create ? n.create({ modelTypeId: e, id: o, options: r }) : new n.class(o, r), f = new Pp({
+        const h = n.create ? n.create({ modelTypeId: e, id: o, options: r }) : new n.class(o, r), p = new Pp({
           modelTypeName: e,
           id: o,
           modelData: h
         });
-        this.cache.addModel(f), this._createCompanionModels(f, r);
+        this.cache.addModel(p), this._createCompanionModels(p, r);
       } catch (h) {
         throw hi(h, {
           modelType: e,
@@ -6983,7 +6983,7 @@ let kp = class {
     return zs(e);
   }
 };
-const Lp = 10, Ei = g.createLogger({ name: "kos-model-manager" });
+const Lp = 10, Ei = m.createLogger({ name: "kos-model-manager" });
 class Fp {
   constructor() {
     l(this, "cache");
@@ -7403,7 +7403,7 @@ const Np = (t) => {
     r,
     (o) => C.debug(o.machine.current)
   ), online: s };
-}, Q = g.createLogger({ name: "kos-core" }), Up = () => {
+}, Q = m.createLogger({ name: "kos-core" }), Up = () => {
   const t = $e(), e = t == null ? void 0 : t.alias, s = process.env.KOS_CONNECTION_ALIAS;
   return e || s || void 0;
 }, jp = () => {
@@ -7434,9 +7434,9 @@ const Np = (t) => {
   let s;
   return { promise: new Promise((o, i) => {
     s = setTimeout(() => {
-      e ? g.error(
+      e ? m.error(
         `Model ${e.modelId} - ${e.modelTypeName} preloading - timed out after ${t}ms`
-      ) : g.error(`KOS Core preloading timed out after ${t}ms`), i(
+      ) : m.error(`KOS Core preloading timed out after ${t}ms`), i(
         new Error(
           `Model ${e == null ? void 0 : e.modelId} - ${e == null ? void 0 : e.modelTypeName} - timed out after ${t}ms`
         )
@@ -7583,21 +7583,21 @@ class T {
     var i, a, c;
     const n = this.getInstance({ reset: s, connectionAlias: r });
     (i = e.extensions) != null && i.dataMapper && Object.keys(e.extensions.dataMapper).forEach((u) => {
-      var h, f;
-      const d = (f = (h = e.extensions) == null ? void 0 : h.dataMapper) == null ? void 0 : f[u];
-      d && (Array.isArray(d) ? d.forEach((p) => {
-        M.dataMapper.registerDataMapper(u, p);
+      var h, p;
+      const d = (p = (h = e.extensions) == null ? void 0 : h.dataMapper) == null ? void 0 : p[u];
+      d && (Array.isArray(d) ? d.forEach((f) => {
+        M.dataMapper.registerDataMapper(u, f);
       }) : M.dataMapper.registerDataMapper(u, d));
     }), (a = e.extensions) != null && a.propertyMapper && Object.keys(e.extensions.propertyMapper).forEach((u) => {
-      var h, f;
-      const d = (f = (h = e.extensions) == null ? void 0 : h.propertyMapper) == null ? void 0 : f[u];
+      var h, p;
+      const d = (p = (h = e.extensions) == null ? void 0 : h.propertyMapper) == null ? void 0 : p[u];
       d && M.propertyMapper.registerPropertyMapper(
         u,
         d
       );
     }), (c = e.extensions) != null && c.contextLoader && Object.keys(e.extensions.contextLoader).forEach((u) => {
-      var h, f;
-      const d = (f = (h = e.extensions) == null ? void 0 : h.contextLoader) == null ? void 0 : f[u];
+      var h, p;
+      const d = (p = (h = e.extensions) == null ? void 0 : h.contextLoader) == null ? void 0 : p[u];
       d && M.loader.registerLoader(u, d);
     }), A.model.getAll().forEach(([, u]) => {
       e.models = { ...e.models, ...u.registration };
@@ -7607,15 +7607,15 @@ class T {
     }, A.companion.getAll().forEach(([u, d]) => {
       e.companionModels = { ...e.companionModels }, e.companionModels[u] = e.companionModels[u] || [];
       for (const h of d) {
-        let f;
+        let p;
         if (typeof h == "string") {
-          const p = e.models[h];
-          if (p != null && p.class) {
-            const m = p.class.prototype[vt];
-            f = m == null ? void 0 : m.lifecycle;
+          const f = e.models[h];
+          if (f != null && f.class) {
+            const g = f.class.prototype[vt];
+            p = g == null ? void 0 : g.lifecycle;
           }
         }
-        e.companionModels[u].push({ type: h, lifecycle: f });
+        e.companionModels[u].push({ type: h, lifecycle: p });
       }
     }), A.model.getPreloadModels().forEach((u) => {
       e.preloadModels.includes(u) || e.preloadModels.push(u);
@@ -7628,7 +7628,7 @@ class T {
   }
 }
 l(T, "_instance");
-const Kp = g.createLogger({
+const Kp = m.createLogger({
   name: "kos-model-visitor",
   group: "kos-ui-core"
 });
@@ -7889,7 +7889,7 @@ qs(eg, {
     const s = sr.get(t);
     if (!s)
       return [];
-    const r = s.map((a) => a(e)), o = (await Promise.allSettled(r)).map((a) => a.status === "fulfilled" ? a.value : (g.info(`Feature flag resolver ${t} failed: ${a.reason}`), [])).flat(), i = Array.from(new Set(o)).reduce(
+    const r = s.map((a) => a(e)), o = (await Promise.allSettled(r)).map((a) => a.status === "fulfilled" ? a.value : (m.info(`Feature flag resolver ${t} failed: ${a.reason}`), [])).flat(), i = Array.from(new Set(o)).reduce(
       (a, c) => (a[c] = !0, a),
       {}
     );
@@ -8000,7 +8000,7 @@ const h_ = async (t, e) => {
   }), u = r ?? 3e3, d = window.setInterval(() => {
     let y = performance.now() - a;
     y = y / 1e3, y > u / 1e3 && i.abort();
-  }, u), h = n ?? 2e3, f = window.setInterval(() => {
+  }, u), h = n ?? 2e3, p = window.setInterval(() => {
     Gf({
       msg: {},
       options: {
@@ -8008,12 +8008,12 @@ const h_ = async (t, e) => {
         destinationAddress: e
       }
     });
-  }, h), p = () => {
-    window.clearInterval(f), window.clearInterval(d), c();
-  }, m = () => {
-    p(), s && s(), i.signal.removeEventListener("abort", m);
+  }, h), f = () => {
+    window.clearInterval(p), window.clearInterval(d), c();
+  }, g = () => {
+    f(), s && s(), i.signal.removeEventListener("abort", g);
   };
-  return i.signal.addEventListener("abort", m), { cleanUpHeartbeat: p };
+  return i.signal.addEventListener("abort", g), { cleanUpHeartbeat: f };
 }, cg = (...t) => (e) => t.reduce((s, r) => r(s), e), lg = {
   maxAttempts: 5,
   baseDelayMs: 100,
@@ -8027,14 +8027,14 @@ async function m_(t, e) {
     try {
       return await t();
     } catch (c) {
-      if (g.error(`Attempt ${s} failed: ${c}`), s < n)
+      if (m.error(`Attempt ${s} failed: ${c}`), s < n)
         a = o * Math.pow(i, s), await new Promise((u) => setTimeout(u, a)), s++;
       else
         throw c;
     }
   throw new Error("All attempts failed");
 }
-const ug = g.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMock: !1, URL: we }), dg = (t, e, s) => async ({
+const ug = m.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMock: !1, URL: we }), dg = (t, e, s) => async ({
   id: r,
   tracker: n,
   urlOverride: o,
@@ -8044,35 +8044,35 @@ const ug = g.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMoc
   bridge: u,
   timeout: d,
   signal: h,
-  destinationAddress: f
+  destinationAddress: p
 }) => {
-  const p = {
+  const f = {
     method: "DELETE"
   };
-  t && (p.destinationAddress = t), n && (p.tracker = n), rs(p, {
+  t && (f.destinationAddress = t), n && (f.tracker = n), rs(f, {
     ordered: i,
     studio: a,
     fos: c,
     bridge: u,
     timeout: d,
     signal: h,
-    destinationAddress: f
+    destinationAddress: p
   });
   try {
-    const m = await s(o || `${e}/${r}`, p);
-    if (!m.ok)
+    const g = await s(o || `${e}/${r}`, f);
+    if (!g.ok)
       throw Error(
-        `There was a problem deleting the model; returned status ${m.status}`
+        `There was a problem deleting the model; returned status ${g.status}`
       );
-    return await m.json() ?? void 0;
-  } catch (m) {
-    if (m instanceof DOMException) {
-      if (m.name === "TimeoutError")
+    return await g.json() ?? void 0;
+  } catch (g) {
+    if (g instanceof DOMException) {
+      if (g.name === "TimeoutError")
         throw new G("Request timed out while deleting model");
-      if (m.name === "AbortError")
+      if (g.name === "AbortError")
         throw new G("Request was cancelled while deleting model");
     }
-    throw m;
+    throw g;
   }
 }, rs = (t, {
   ordered: e,
@@ -8104,29 +8104,29 @@ const ug = g.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMoc
     signal: u,
     destinationAddress: d
   });
-  const f = r || e;
+  const p = r || e;
   try {
-    const p = await s(f, h);
-    if (!p.ok) {
+    const f = await s(p, h);
+    if (!f.ok) {
       let y;
       try {
-        y = await p.json();
+        y = await f.json();
       } catch {
       }
       throw new G(
-        `There was a problem retrieving the model; returned status ${p.status}`,
+        `There was a problem retrieving the model; returned status ${f.status}`,
         y ?? void 0
       );
     }
-    return await p.json() ?? void 0;
-  } catch (p) {
-    if (p instanceof DOMException) {
-      if (p.name === "TimeoutError")
+    return await f.json() ?? void 0;
+  } catch (f) {
+    if (f instanceof DOMException) {
+      if (f.name === "TimeoutError")
         throw new G("Request timed out while retrieving models");
-      if (p.name === "AbortError")
+      if (f.name === "AbortError")
         throw new G("Request was cancelled while retrieving models");
     }
-    throw p;
+    throw f;
   }
 }, fg = (t, e, s) => async ({
   urlOverride: r,
@@ -8139,10 +8139,10 @@ const ug = g.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMoc
   signal: d,
   destinationAddress: h
 }) => {
-  const f = {
+  const p = {
     method: "GET"
   };
-  t && (f.destinationAddress = t), c && (f.tracker = c), rs(f, {
+  t && (p.destinationAddress = t), c && (p.tracker = c), rs(p, {
     timeout: u,
     ordered: n,
     studio: o,
@@ -8151,30 +8151,30 @@ const ug = g.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMoc
     signal: d,
     destinationAddress: h
   });
-  const p = r || e;
-  ug.debug(`resolvedUrl: ${p}`);
+  const f = r || e;
+  ug.debug(`resolvedUrl: ${f}`);
   try {
-    const m = await s(p, f);
-    if (!m.ok) {
+    const g = await s(f, p);
+    if (!g.ok) {
       let v;
       try {
-        v = await m.json();
+        v = await g.json();
       } catch {
       }
       throw new G(
-        `There was a problem retrieving the model; returned status ${m.status}`,
+        `There was a problem retrieving the model; returned status ${g.status}`,
         v ?? void 0
       );
     }
-    return await m.json() ?? void 0;
-  } catch (m) {
-    if (m instanceof DOMException) {
-      if (m.name === "TimeoutError")
+    return await g.json() ?? void 0;
+  } catch (g) {
+    if (g instanceof DOMException) {
+      if (g.name === "TimeoutError")
         throw new G("Request timed out while retrieving model");
-      if (m.name === "AbortError")
+      if (g.name === "AbortError")
         throw new G("Request was cancelled while retrieving model");
     }
-    throw m;
+    throw g;
   }
 }, pg = (t, e, s) => async ({
   urlOverride: r,
@@ -8187,10 +8187,10 @@ const ug = g.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMoc
   signal: d,
   destinationAddress: h
 }) => {
-  const f = {
+  const p = {
     method: "GET"
   };
-  t && (f.destinationAddress = t), rs(f, {
+  t && (p.destinationAddress = t), rs(p, {
     timeout: u,
     ordered: o,
     studio: i,
@@ -8199,33 +8199,33 @@ const ug = g.createLogger({ name: "kos-service-request" }), Ee = (t) => ({ isMoc
     signal: d,
     destinationAddress: h
   });
-  const p = r || `${e}/${n}`;
+  const f = r || `${e}/${n}`;
   try {
-    const m = await s(p, f);
-    if (!m.ok) {
+    const g = await s(f, p);
+    if (!g.ok) {
       let v;
       try {
-        v = await m.json();
+        v = await g.json();
       } catch {
       }
       throw new G(
-        `There was a problem retrieving the model; returned status ${m.status}`,
+        `There was a problem retrieving the model; returned status ${g.status}`,
         v ?? void 0
       );
     }
-    return await m.json() ?? void 0;
-  } catch (m) {
-    if (m instanceof DOMException) {
-      if (m.name === "TimeoutError")
+    return await g.json() ?? void 0;
+  } catch (g) {
+    if (g instanceof DOMException) {
+      if (g.name === "TimeoutError")
         throw new G(
           "Request timed out while retrieving model by ID"
         );
-      if (m.name === "AbortError")
+      if (g.name === "AbortError")
         throw new G(
           "Request was cancelled while retrieving model by ID"
         );
     }
-    throw m;
+    throw g;
   }
 };
 class G extends Error {
@@ -8245,43 +8245,43 @@ const Ii = (t, e, s) => async ({
   bridge: u,
   timeout: d,
   signal: h,
-  destinationAddress: f
+  destinationAddress: p
 }) => {
-  const p = {
+  const f = {
     method: "POST",
     body: typeof r == "string" ? r : JSON.stringify(r)
   };
-  t && (p.destinationAddress = t), i && (p.tracker = i), rs(p, {
+  t && (f.destinationAddress = t), i && (f.tracker = i), rs(f, {
     timeout: d,
     ordered: o,
     studio: a,
     fos: c,
     bridge: u,
     signal: h,
-    destinationAddress: f
+    destinationAddress: p
   });
   try {
-    const m = await s(n || e, p);
-    if (!m.ok) {
+    const g = await s(n || e, f);
+    if (!g.ok) {
       let v;
       try {
-        v = await m.json();
+        v = await g.json();
       } catch {
       }
       throw new G(
-        `There was a problem sending the POST data; returned status ${m.status}`,
+        `There was a problem sending the POST data; returned status ${g.status}`,
         v ?? void 0
       );
     }
-    return await m.json() ?? void 0;
-  } catch (m) {
-    if (m instanceof DOMException) {
-      if (m.name === "TimeoutError")
+    return await g.json() ?? void 0;
+  } catch (g) {
+    if (g instanceof DOMException) {
+      if (g.name === "TimeoutError")
         throw new G("Request timed out while adding model");
-      if (m.name === "AbortError")
+      if (g.name === "AbortError")
         throw new G("Request was cancelled while adding model");
     }
-    throw m;
+    throw g;
   }
 }, Oi = (t = "POST", e, s, r) => async ({
   // Reqeust should be Request = unknown...
@@ -8293,23 +8293,23 @@ const Ii = (t, e, s) => async ({
   fos: u,
   bridge: d,
   timeout: h,
-  signal: f,
-  destinationAddress: p
+  signal: p,
+  destinationAddress: f
 }) => {
-  const m = {
+  const g = {
     method: t
   };
-  n && (m.body = JSON.stringify(n)), e && (m.destinationAddress = e), rs(m, {
+  n && (g.body = JSON.stringify(n)), e && (g.destinationAddress = e), rs(g, {
     timeout: h,
     ordered: a,
     studio: c,
     fos: u,
     bridge: d,
-    signal: f,
-    destinationAddress: p
+    signal: p,
+    destinationAddress: f
   });
   try {
-    const y = await r(i || `${s}/${o}`, m);
+    const y = await r(i || `${s}/${o}`, g);
     if (!y.ok) {
       let _;
       try {
@@ -8586,7 +8586,7 @@ const J = {
   rootContext: () => Me.get("root")
 };
 J.createContext("root");
-const $_ = (t) => J.getContext(t.id), lt = g.createLogger({ name: "kos-data-container" });
+const $_ = (t) => J.getContext(t.id), lt = m.createLogger({ name: "kos-data-container" });
 class gc {
   constructor(e) {
     l(this, "_data");
@@ -8988,8 +8988,8 @@ class vg {
         let d = 0;
         const h = async () => {
           if (d < c.middlewares.length) {
-            const f = c.middlewares[d++];
-            await f(i, s, h);
+            const p = c.middlewares[d++];
+            await p(i, s, h);
           }
         };
         await h();
@@ -9056,7 +9056,7 @@ class vg {
     }, {}) : {};
   }
 }
-const mc = g.createLogger({ name: "intent-service" }), O_ = (t) => {
+const mc = m.createLogger({ name: "intent-service" }), O_ = (t) => {
   mo(`/kos/intent/${t.type}`) ? H(`/kos/intent/${t.type}`, t.options, {
     "kos.intent.type": t.type
   }) : mc.info(`No subscribers for intent ${t.type}. Intent not sent.`);
@@ -9077,7 +9077,7 @@ const mc = g.createLogger({ name: "intent-service" }), O_ = (t) => {
     });
   } else
     mc.info(`No subscribers for intent ${t.type}. Intent not sent.`), e([null, { body: void 0, payload: void 0 }]);
-}), He = g.createLogger({ name: "app-startup-service" });
+}), He = m.createLogger({ name: "app-startup-service" });
 async function wg(t, e = {}) {
   const {
     timeout: s = 3e4,
@@ -9155,7 +9155,7 @@ async function A_() {
 }
 const Ci = Ns, yc = ha, ae = Z, ee = Xt, Eg = Jt, bc = te, vc = "Not Assigned", P_ = "kos.trouble.added", R_ = "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 || {}), wr = /* @__PURE__ */ ((t) => (t.TIME_CHANGE = "/kos/internal/time/time", t.DAY_CHANGE = "/kos/internal/time/day", t.TIMEZONE_CHANGE = "/kos/internal/time/timezone", t))(wr || {});
-const wc = g.createLogger({
+const wc = m.createLogger({
   name: "config-bean-service",
   group: "Services"
 }), Oo = we, Mg = (t) => (t == null ? void 0 : t.decimals) !== void 0, { postModel: _g, getOne: Tg } = ge.build({
@@ -9225,7 +9225,7 @@ function Pg(t, e) {
     if (new RegExp(`^${s}$`).test(e))
       return s;
 }
-const Do = "config-bean-model", rr = g.getLogger(Do), Rg = es("path");
+const Do = "config-bean-model", rr = m.getLogger(Do), Rg = es("path");
 function kg(t) {
   return M.propertyMapper.hasMapper(
     ce.ConfigServicePath
@@ -9521,7 +9521,7 @@ var Bg = Object.defineProperty, Hg = Object.getOwnPropertyDescriptor, Po = (t, e
     (i = t[o]) && (n = (r ? i(e, s, n) : i(n)) || n);
   return r && n && Bg(e, s, n), n;
 };
-const Er = "region-info-model", ds = g.createLogger({ name: "region-info-model" });
+const Er = "region-info-model", ds = m.createLogger({ name: "region-info-model" });
 function qg(t) {
   return M.propertyMapper.hasMapper(
     ce.RegionServicePath
@@ -9885,7 +9885,7 @@ const F_ = (t, e, s, r) => {
   }), d = i.getDefaultUnitForMeasure(a, u.system), h = i.getDefaultUnitDecimalPlaces(
     a,
     u.system
-  ), f = {
+  ), p = {
     ...r,
     minDecimals: (r == null ? void 0 : r.minDecimals) ?? h,
     maxDecimals: (r == null ? void 0 : r.maxDecimals) ?? h
@@ -9894,13 +9894,13 @@ const F_ = (t, e, s, r) => {
     value: n,
     unit: d || o.unit || "",
     display: Di(n, d || o.unit || "", {
-      ...f,
+      ...p,
       mode: "long"
     }),
     shortDisplay: Di(
       n,
       d || o.unit || "",
-      { ...f, mode: "short" }
+      { ...p, mode: "short" }
     )
   };
 };
@@ -10022,7 +10022,7 @@ function Qg(t, e) {
   const r = new Date(s.getTime() + t * 1e3);
   return gt(r, e);
 }
-const Mr = "config-bean-prop-model", At = g.createLogger({ name: "config-bean-prop-model" }), Zg = es("path"), Xg = es("serviceBasePath");
+const Mr = "config-bean-prop-model", At = m.createLogger({ name: "config-bean-prop-model" }), Zg = es("path"), Xg = es("serviceBasePath");
 let Cs = class {
   constructor(t, e) {
     l(this, "id");
@@ -10331,13 +10331,13 @@ let Cs = 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, p, f;
     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(
+      const g = (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, _ = g || 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
-      ), D = ((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;
+      ), D = ((f = (p = this.converter) == null ? void 0 : p.to) == null ? void 0 : f.system) ?? this.regionInfo.getUnitSystem(U), $ = this.schemaFormat === "drt" ? "second" : this.schemaFormat || s;
       return {
         ...this.converter,
         from: {
@@ -10353,14 +10353,14 @@ let Cs = class {
       };
     }
     if (s && e) {
-      const m = this.regionInfo.getDefaultUnitForMeasure(
+      const g = this.regionInfo.getDefaultUnitForMeasure(
         e,
         this.regionInfo.defaultUnitSystem
-      ), y = this.regionInfo.getUnitSystem(s), v = this.regionInfo.getUnitSystem(m);
+      ), y = this.regionInfo.getUnitSystem(s), v = this.regionInfo.getUnitSystem(g);
       return {
         measure: e,
         to: {
-          unit: y === v ? s : m
+          unit: y === v ? s : g
         }
       };
     }
@@ -10449,7 +10449,7 @@ const Oc = (t) => ({
   note: t.note,
   tracker: t.tracker
 }), Cc = (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}`), Z(() => {
+  m.debug(`future dto ${t.id} end state ${t.endState}`), m.debug(`future model ${e.id} end state ${e.endState}`), e.endState ? m.debug(`future model ${e.id} is already complete`) : (m.debug(`updating future model ${e.id}`), Z(() => {
     const s = Oc(t);
     ae(() => {
       Object.keys(s).forEach((r) => {
@@ -10460,7 +10460,7 @@ const Oc = (t) => ({
 }, Jg = (t) => (e) => (s) => t.build(String(e), s), Dc = (t) => (e) => cg(
   Oc,
   Jg(t)(e.tracker || e.id)
-)(e), nn = g.createLogger({ name: "future-service", group: "Services" }), { isMock: em, URL: Vs } = Ee();
+)(e), nn = m.createLogger({ name: "future-service", group: "Services" }), { isMock: em, URL: Vs } = Ee();
 var wt = /* @__PURE__ */ ((t) => (t.Success = "SUCCESS", t.Fail = "FAIL", t.Aborted = "ABORT", t.Canceled = "CANCEL", t))(wt || {});
 const { getAll: tm, modifyModel: sm, addModel: rm, deleteModel: nm, postModel: om } = ge.build({
   destinationAddress: "",
@@ -10598,7 +10598,7 @@ var gm = Object.defineProperty, mm = Object.getOwnPropertyDescriptor, Rc = (t, e
     (i = t[o]) && (n = (r ? i(e, s, n) : i(n)) || n);
   return r && n && gm(e, s, n), n;
 };
-const Rn = g.getLogger(Ks.type);
+const Rn = m.getLogger(Ks.type);
 let Dr = class {
   /**
    * @category Constructor
@@ -10738,7 +10738,7 @@ var Em = Object.defineProperty, Mm = Object.getOwnPropertyDescriptor, ko = (t, e
     (i = t[o]) && (n = (r ? i(e, s, n) : i(n)) || n);
   return r && n && Em(e, s, n), n;
 };
-const nr = g.getLogger(Et.type);
+const nr = m.getLogger(Et.type);
 let Ds = class {
   constructor(t, e, s) {
     l(this, "id");
@@ -10895,7 +10895,7 @@ Ds = ko([
 ], Ds);
 const _m = Ds, { URL: Gs } = Ee(), { getOne: Tm, postModel: $m, deleteModel: Lc } = ge.build({
   basePath: `${Gs}/api/keyVal`
-}), Gn = g.createLogger({
+}), Gn = m.createLogger({
   name: "key-value-service",
   group: "Services"
 }), Fc = async (t, e) => {
@@ -11044,29 +11044,29 @@ function Hc(t) {
 }
 function Yn(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 === Mt)
-      Array.isArray(f.value) ? o.push.apply(o, Yn(f.value.map(function(m) {
-        return new P(_e, m);
-      }).concat(new P(Kt, f.value.length)), e, s, r, n)) : o.push(f);
-    else if (p === Ke && n.hasOwnProperty(f.value))
-      f = new P(_e, n[f.value]), o.push(f);
-    else if (p === is && o.length > 1)
-      c = o.pop(), a = o.pop(), d = s[f.value], f = new P(_e, d(a.value, c.value)), o.push(f);
-    else if (p === as && 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 P(_e, d(a.value, c.value, u.value)), o.push(f));
-    else if (p === os && o.length > 0)
-      a = o.pop(), d = e[f.value], f = new P(_e, d(a.value)), o.push(f);
-    else if (p === pe) {
+    var p = t[h], f = p.type;
+    if (f === _e || f === Mt)
+      Array.isArray(p.value) ? o.push.apply(o, Yn(p.value.map(function(g) {
+        return new P(_e, g);
+      }).concat(new P(Kt, p.value.length)), e, s, r, n)) : o.push(p);
+    else if (f === Ke && n.hasOwnProperty(p.value))
+      p = new P(_e, n[p.value]), o.push(p);
+    else if (f === is && o.length > 1)
+      c = o.pop(), a = o.pop(), d = s[p.value], p = new P(_e, d(a.value, c.value)), o.push(p);
+    else if (f === as && o.length > 2)
+      u = o.pop(), c = o.pop(), a = o.pop(), p.value === "?" ? o.push(a.value ? c.value : u.value) : (d = r[p.value], p = new P(_e, d(a.value, c.value, u.value)), o.push(p));
+    else if (f === os && o.length > 0)
+      a = o.pop(), d = e[p.value], p = new P(_e, d(a.value)), o.push(p);
+    else if (f === pe) {
       for (; o.length > 0; )
         i.push(o.shift());
-      i.push(new P(pe, Yn(f.value, e, s, r, n)));
-    } else if (p === St && o.length > 0)
-      a = o.pop(), o.push(new P(_e, a.value[f.value]));
+      i.push(new P(pe, Yn(p.value, e, s, r, n)));
+    } else if (f === St && o.length > 0)
+      a = o.pop(), o.push(new P(_e, a.value[p.value]));
     else {
       for (; o.length > 0; )
         i.push(o.shift());
-      i.push(f);
+      i.push(p);
     }
   }
   for (; o.length > 0; )
@@ -11091,37 +11091,37 @@ function ft(t, e, s) {
   if (No(t))
     return Be(t, s);
   for (var d = t.length, h = 0; h < d; h++) {
-    var f = t[h], p = f.type;
-    if (p === _e || p === Mt)
-      r.push(f.value);
-    else if (p === is)
-      o = r.pop(), n = r.pop(), f.value === "and" ? r.push(n ? !!ft(o, e, s) : !1) : f.value === "or" ? r.push(n ? !0 : !!ft(o, e, s)) : f.value === "=" ? (a = e.binaryOps[f.value], r.push(a(n, ft(o, e, s), s))) : (a = e.binaryOps[f.value], r.push(a(Be(n, s), Be(o, s))));
-    else if (p === as)
-      i = r.pop(), o = r.pop(), n = r.pop(), f.value === "?" ? r.push(ft(n ? o : i, e, s)) : (a = e.ternaryOps[f.value], r.push(a(Be(n, s), Be(o, s), Be(i, s))));
-    else if (p === Ke)
-      if (f.value in e.functions)
-        r.push(e.functions[f.value]);
-      else if (f.value in e.unaryOps && e.parser.isOperatorEnabled(f.value))
-        r.push(e.unaryOps[f.value]);
+    var p = t[h], f = p.type;
+    if (f === _e || f === Mt)
+      r.push(p.value);
+    else if (f === is)
+      o = r.pop(), n = r.pop(), p.value === "and" ? r.push(n ? !!ft(o, e, s) : !1) : p.value === "or" ? r.push(n ? !0 : !!ft(o, e, s)) : p.value === "=" ? (a = e.binaryOps[p.value], r.push(a(n, ft(o, e, s), s))) : (a = e.binaryOps[p.value], r.push(a(Be(n, s), Be(o, s))));
+    else if (f === as)
+      i = r.pop(), o = r.pop(), n = r.pop(), p.value === "?" ? r.push(ft(n ? o : i, e, s)) : (a = e.ternaryOps[p.value], r.push(a(Be(n, s), Be(o, s), Be(i, s))));
+    else if (f === Ke)
+      if (p.value in e.functions)
+        r.push(e.functions[p.value]);
+      else if (p.value in e.unaryOps && e.parser.isOperatorEnabled(p.value))
+        r.push(e.unaryOps[p.value]);
       else {
-        var m = s[f.value];
-        if (m !== void 0)
-          r.push(m);
+        var g = s[p.value];
+        if (g !== void 0)
+          r.push(g);
         else
-          throw new Error("undefined variable: " + f.value);
+          throw new Error("undefined variable: " + p.value);
       }
-    else if (p === os)
-      n = r.pop(), a = e.unaryOps[f.value], r.push(a(Be(n, s)));
-    else if (p === Vt) {
-      for (u = f.value, c = []; u-- > 0; )
+    else if (f === os)
+      n = r.pop(), a = e.unaryOps[p.value], r.push(a(Be(n, s)));
+    else if (f === Vt) {
+      for (u = p.value, c = []; u-- > 0; )
         c.unshift(Be(r.pop(), s));
       if (a = r.pop(), a.apply && a.call)
         r.push(a.apply(void 0, c));
       else
         throw new Error(a + " is not a function");
-    } else if (p === on)
+    } else if (f === on)
       r.push(function() {
-        for (var y = r.pop(), v = [], _ = f.value; _-- > 0; )
+        for (var y = r.pop(), v = [], _ = p.value; _-- > 0; )
           v.unshift(r.pop());
         var U = r.pop(), D = function() {
           for (var $ = Object.assign({}, s), L = 0, se = v.length; L < se; L++)
@@ -11133,16 +11133,16 @@ function ft(t, e, s) {
           writable: !1
         }), s[U] = D, D;
       }());
-    else if (p === pe)
-      r.push(Cm(f, e));
-    else if (p === Fo)
-      r.push(f);
-    else if (p === St)
-      n = r.pop(), r.push(n[f.value]);
-    else if (p === an)
+    else if (f === pe)
+      r.push(Cm(p, e));
+    else if (f === Fo)
+      r.push(p);
+    else if (f === St)
+      n = r.pop(), r.push(n[p.value]);
+    else if (f === an)
       r.pop();
-    else if (p === Kt) {
-      for (u = f.value, c = []; u-- > 0; )
+    else if (f === Kt) {
+      for (u = p.value, c = []; u-- > 0; )
         c.unshift(r.pop());
       r.push(c);
     } else
@@ -12305,7 +12305,7 @@ Oy(xr, "Registration");
 xr = Iy([
   R({ modelTypeId: Cy, singleton: !1 })
 ], xr);
-const xy = xr.Registration, Ay = g.createLogger({
+const xy = xr.Registration, Ay = m.createLogger({
   name: "kos-log-manager-service",
   group: "Services"
 }), Py = "/api/kos/logs/overrides", Gc = async () => (Ay.debug("sending GET for  kos-log-manager"), await je.get(Py)), H_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -12353,7 +12353,7 @@ let Yt = class {
    * @private
    */
   resolveLoggers() {
-    const t = g.getLoggers(), s = Object.entries(t).map(
+    const t = m.getLoggers(), s = Object.entries(t).map(
       ([r, n]) => ({
         name: r,
         level: Ny(n.getLevel())
@@ -12379,14 +12379,14 @@ let Yt = class {
     Object.values(this.resolveLoggers()).filter(
       (r) => r.name.startsWith(t.name)
     ).forEach((r) => {
-      const n = g.getLoggers()[r.name];
+      const n = m.getLoggers()[r.name];
       if (!n) {
         this.logger.debug(`Logger ${r.name} not found`);
         return;
       }
       n.setLevel(t.level);
     });
-    const s = g.getLoggers()[t.name];
+    const s = m.getLoggers()[t.name];
     if (!s) {
       this.logger.debug(`Logger ${t.name} not found`);
       return;
@@ -12404,10 +12404,10 @@ let Yt = class {
     Object.values(this.resolveLoggers()).filter(
       (r) => r.name.startsWith(t.name)
     ).forEach((r) => {
-      const n = g.getLoggers()[r.name];
+      const n = m.getLoggers()[r.name];
       n || this.logger.debug(`Logger ${r.name} not found`), n == null || n.resetLevel();
     });
-    const s = g.getLoggers()[t.name];
+    const s = m.getLoggers()[t.name];
     s || this.logger.debug(`Logger ${t.name} not found`), s == null || s.resetLevel(), globalThis.kos.logOverrides = this._overrides.data;
   }
   handleOverrideAdded(t, e) {
@@ -12480,7 +12480,7 @@ const Uy = new Ne({
 }), { URL: Ys } = Ee(), { postModel: zo, getOne: jy } = ge.build({
   basePath: `${Ys}/api/kos-time`
 });
-g.createLogger({
+m.createLogger({
   name: "kos-time-service",
   group: "Services"
 });
@@ -12656,13 +12656,13 @@ Jc([
 Ar = Jc([
   R(el)
 ], Ar);
-const Yy = g.createLogger({
+const Yy = m.createLogger({
   name: "log-stream-container-service",
   group: "Services"
 }), tl = () => {
   var r;
   const t = $e(), s = (t == null ? void 0 : t.connId) || ((r = window == null ? void 0 : window.kosBridge) == null ? void 0 : r.call(window, "connId"));
-  return g.error(`getKosConnectionId: ${s}`), s;
+  return m.error(`getKosConnectionId: ${s}`), s;
 }, cs = tl(), Wy = "/api/kos/logs/node/{nodeId}/streams", sl = async () => (Yy.debug("sending GET for  log-stream-container"), await je.get(
   Wy,
   {
@@ -13132,7 +13132,7 @@ const ab = (t) => (t == null ? void 0 : t.rank) !== void 0, cb = (t) => (t == nu
 }), fl = () => {
   var r;
   const t = $e(), s = (t == null ? void 0 : t.connId) || ((r = window == null ? void 0 : window.kosBridge) == null ? void 0 : r.call(window, "connId"));
-  return g.error(`getKosConnectionId: ${s}`), s;
+  return m.error(`getKosConnectionId: ${s}`), s;
 }, Ko = fl(), pl = async (t) => await fb({
   urlOverride: `${pn}${t}`,
   destinationAddress: Ko
@@ -13192,7 +13192,7 @@ qs(Zn, {
       };
     const r = s.map((i) => i(e));
     return (await Promise.allSettled(r)).reduce(
-      (i, a) => (a.status === "fulfilled" ? i = { ...i, ...a.value } : g.info(`Trouble mapper ${t} failed: ${a.reason}`), i),
+      (i, a) => (a.status === "fulfilled" ? i = { ...i, ...a.value } : m.info(`Trouble mapper ${t} failed: ${a.reason}`), i),
       { ...e.data }
     );
   }
@@ -13207,7 +13207,7 @@ qs(gn, {
     const s = ir.get(t);
     if (!s)
       return [];
-    const r = s.map((i) => i(e)), o = (await Promise.allSettled(r)).map((i) => i.status === "fulfilled" ? i.value : (g.info(`Trouble mapper ${t} failed: ${i.reason}`), [])).flat();
+    const r = s.map((i) => i(e)), o = (await Promise.allSettled(r)).map((i) => i.status === "fulfilled" ? i.value : (m.info(`Trouble mapper ${t} failed: ${i.reason}`), [])).flat();
     return Array.from(new Set(o));
   }
 });
@@ -13288,9 +13288,9 @@ let kr = class {
     group: u,
     createTime: d,
     role: h,
-    color: f,
-    servicePath: p,
-    rawJson: m,
+    color: p,
+    servicePath: f,
+    rawJson: g,
     ...y
   }, v) {
     l(this, "id");
@@ -13312,7 +13312,7 @@ let kr = class {
     l(this, "createTime");
     l(this, "rawJson");
     l(this, "_mapped", {});
-    this.id = t, this.logger = v.logger, this.type = c, this._troubleId = n, this._resolvable = !!e, this.ifaces = a, this.rank = i, this.role = h, this.color = f, this.tags = s, this.info = r, this.group = u, this.rawJson = m, this.servicePath = p ?? "/api/kos/troubles", this.createTime = d, this.clientData = o, this.data = {}, Object.assign(this.data, y), this.futureHandler = new _o(this);
+    this.id = t, this.logger = v.logger, this.type = c, this._troubleId = n, this._resolvable = !!e, this.ifaces = a, this.rank = i, this.role = h, this.color = p, this.tags = s, this.info = r, this.group = u, this.rawJson = g, this.servicePath = f ?? "/api/kos/troubles", this.createTime = d, this.clientData = o, this.data = {}, Object.assign(this.data, y), this.futureHandler = new _o(this);
   }
   // -------------------LIFECYCLE----------------------------
   getTitleWithContext(t) {
@@ -13518,7 +13518,7 @@ _t = mn([
 ], _t);
 const Ps = _t.Registration, { URL: vl } = Ee(), { getAll: Tb } = ge.build({
   basePath: `${vl}/api/kos/ota`
-}), qi = g.createLogger({
+}), qi = m.createLogger({
   name: "ota-service",
   group: "Services"
 }), $b = async () => {
@@ -13705,7 +13705,7 @@ function Cb(t) {
     e && (e.abort(), e = void 0);
   }, s.getController = () => e, s.isActive = () => !!e, s;
 }
-const Fn = g.createLogger({
+const Fn = m.createLogger({
   name: "software-info-service",
   group: "Services"
 }), Go = async (t) => {
@@ -13793,7 +13793,7 @@ const eo = {
   )
 }, { URL: El } = Ee(), { getOne: Pb } = ge.build({
   basePath: `${El}/api/kos/state`
-}), Rb = g.createLogger({
+}), Rb = m.createLogger({
   name: "state-bean-service",
   group: "Services"
 }), Ml = async ({ path: t }) => (Rb.debug("sending GET for state-bean"), await Pb({
@@ -13946,7 +13946,7 @@ const $l = {
   factory: ve.Factory.create(ms)
 }, { URL: jb } = Ee(), { getAll: Bb } = ge.build({
   basePath: `${jb}/api/state-prop`
-}), Hb = g.createLogger({
+}), Hb = m.createLogger({
   name: "state-prop-service",
   group: "Services"
 }), qb = async () => (Hb.debug("sending GET for state-prop"), await Bb({})), Y_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -13954,7 +13954,7 @@ const $l = {
   getStateProps: qb
 }, Symbol.toStringTag, { value: "Module" })), { URL: Yo } = Ee(), { getOne: Sl } = ge.build({
   basePath: `${Yo}/api/translation`
-}), Ms = g.createLogger({
+}), Ms = m.createLogger({
   name: "translation-service",
   group: "Services"
 }), zb = () => {
@@ -14034,9 +14034,9 @@ const to = (t, e) => {
     if (u.includes(".")) {
       const d = u.split(".");
       let h = s;
-      for (const f of d)
-        if (h && typeof h == "object" && Object.prototype.hasOwnProperty.call(h, f))
-          h = h[f];
+      for (const p of d)
+        if (h && typeof h == "object" && Object.prototype.hasOwnProperty.call(h, p))
+          h = h[p];
         else
           return a;
       return h;
@@ -14380,7 +14380,7 @@ let Rs = class {
     this.processEvent(e);
   }
   processEvent(t, e = !1) {
-    g.debug("kos event received");
+    m.debug("kos event received");
     const { body: s, headers: r } = t.body, n = r["request-id"] || r["response-id"], o = r["request-id"] || r["response-id"] || r.topic || r.type;
     if (o) {
       let i = o;
@@ -14399,7 +14399,7 @@ let Rs = class {
         direction: e ? "send" : "receive",
         mocked: !!r.mocked
       };
-      this.events.set(i, a), g.debug(`logged ${this.events.size} events`);
+      this.events.set(i, a), m.debug(`logged ${this.events.size} events`);
     }
   }
 };
@@ -15073,14 +15073,14 @@ class mv extends Ct {
         if (i === c)
           u = this.baseColor.r, d = this.baseColor.g, h = this.baseColor.b;
         else if (i < c && i > c - this.trailColors.length) {
-          const p = c - i;
-          if (p < this.trailColors.length) {
-            const m = this.trailColors[p];
-            u = m.r, d = m.g, h = m.b;
+          const f = c - i;
+          if (f < this.trailColors.length) {
+            const g = this.trailColors[f];
+            u = g.r, d = g.g, h = g.b;
           }
         }
-        const f = (i * s + a) * 4;
-        o[f] = u, o[f + 1] = d, o[f + 2] = h, o[f + 3] = 255;
+        const p = (i * s + a) * 4;
+        o[p] = u, o[p + 1] = d, o[p + 2] = h, o[p + 3] = 255;
       }
     this.ctx.putImageData(n, 0, 0);
   }
@@ -15276,10 +15276,10 @@ class Ul extends Ct {
     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, D;
+    var h, p, f, g, y, v, _, U, D;
     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);
+    ((h = this.scrollConfig) == null ? void 0 : h.maintainAspectRatio) !== !1 ? (p = this.scrollConfig) != null && p.height ? (c = this.scrollConfig.height, a = c * i) : (f = this.scrollConfig) != null && f.width ? (a = this.scrollConfig.width, c = a / i) : n === "left" || n === "right" ? (c = r, a = c * i) : (a = s, c = a / i) : (a = ((g = this.scrollConfig) == null ? void 0 : g.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" || ((D = this.scrollConfig) == null ? void 0 : D.offsetX) === void 0 ? u = (s - a) / 2 : u = this.scrollConfig.offsetX, d = 0), n) {
       case "left": {
@@ -15341,12 +15341,12 @@ class Ul extends Ct {
     }
   }
   checkScrollCompletion(s, r, n, o) {
-    var h, f, p, m, y;
+    var h, p, f, g, y;
     if (!this.isPlaying)
       return;
     const i = this.img.width / this.img.height;
     let a, c;
-    switch (((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), n) {
+    switch (((h = this.scrollConfig) == null ? void 0 : h.maintainAspectRatio) !== !1 ? (p = this.scrollConfig) != null && p.height ? (c = this.scrollConfig.height, a = c * i) : (f = this.scrollConfig) != null && f.width ? (a = this.scrollConfig.width, c = a / i) : n === "left" || n === "right" ? (c = r, a = c * i) : (a = s, c = a / i) : (a = ((g = this.scrollConfig) == null ? void 0 : g.width) || s, c = ((y = this.scrollConfig) == null ? void 0 : y.height) || r), n) {
       case "left":
       case "right":
         this.loopConfig;
@@ -15740,7 +15740,7 @@ class Mv extends Ct {
     if (r === 0)
       o = i = a = n;
     else {
-      const c = (h, f, p) => (p < 0 && (p += 1), p > 1 && (p -= 1), p < 0.16666666666666666 ? h + (f - h) * 6 * p : p < 0.5 ? f : p < 0.6666666666666666 ? h + (f - h) * (0.6666666666666666 - p) * 6 : h), u = n < 0.5 ? n * (1 + r) : n + r - n * r, d = 2 * n - u;
+      const c = (h, p, f) => (f < 0 && (f += 1), f > 1 && (f -= 1), f < 0.16666666666666666 ? h + (p - h) * 6 * f : f < 0.5 ? p : f < 0.6666666666666666 ? h + (p - h) * (0.6666666666666666 - f) * 6 : h), u = n < 0.5 ? n * (1 + r) : n + r - n * r, d = 2 * n - u;
       o = c(d, u, s + 1 / 3), i = c(d, u, s), a = c(d, u, s - 1 / 3);
     }
     return [Math.round(o * 255), Math.round(i * 255), Math.round(a * 255)];
@@ -15757,8 +15757,8 @@ class Mv extends Ct {
     let i = 0;
     for (let a = 0; a < r; a++)
       for (let c = 0; c < s; c++) {
-        const u = (c + this.offset) % s / s, d = this.minHue / 360 + u * ((this.maxHue - this.minHue) / 360), [h, f, p] = this.hslToRgb(d, 1, 0.5);
-        o[i++] = h, o[i++] = f, o[i++] = p, o[i++] = 255;
+        const u = (c + this.offset) % s / s, d = this.minHue / 360 + u * ((this.maxHue - this.minHue) / 360), [h, p, f] = this.hslToRgb(d, 1, 0.5);
+        o[i++] = h, o[i++] = p, o[i++] = f, o[i++] = 255;
       }
     this.ctx.putImageData(n, 0, 0);
   }
@@ -15981,7 +15981,7 @@ const ks = new Ne({
   type: jl
 }), { URL: Zo } = Ee(), { getOne: Bl } = ge.build({
   basePath: `${Zo}/api/device`
-}), zr = g.createLogger({ name: "device-service", group: "Services" }), Hl = async () => {
+}), zr = m.createLogger({ name: "device-service", group: "Services" }), Hl = async () => {
   zr.debug("sending GET for device serial number");
   try {
     const t = await Bl({
@@ -16284,7 +16284,7 @@ const Gl = new Ae({
   type: Kl
 }), { URL: Rv } = Ee(), { getAll: kv } = ge.build({
   basePath: `${Rv}/api/kos/network/interfaces`
-}), Wi = g.createLogger({
+}), Wi = m.createLogger({
   name: "network-interface-service",
   group: "Services"
 }), Yl = async () => {
@@ -16381,7 +16381,7 @@ const Gr = new Ne({
 Gr.addRelatedModel(Gl);
 const { URL: Nv } = Ee(), { getAll: Uv } = ge.build({
   basePath: `${Nv}/api/kos/storage/devices`
-}), Qi = g.createLogger({
+}), Qi = m.createLogger({
   name: "storage-device-service",
   group: "Services"
 }), Zl = async () => {
@@ -16548,7 +16548,7 @@ const Fs = new Ne({
 Fs.addRelatedModel(ao);
 const { URL: Jo } = Ee(), { getAll: Vv, postModel: Kv } = ge.build({
   basePath: `${Jo}/api/kos/update/available`
-}), Zi = g.createLogger({
+}), Zi = m.createLogger({
   name: "usb-update-service",
   group: "Services"
 }), eu = async () => {
@@ -16938,7 +16938,7 @@ const na = ot(), hT = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defin
   api: na,
   default: na,
   kosServiceRequest: aw
-}, Symbol.toStringTag, { value: "Module" })), lu = "/kos-timer-event", uu = "/kos-timer-event/tick", du = "defaultTimerEnd", vs = g.createLogger({ name: "timer-manager" }), cw = (t) => t.updateProperty !== void 0;
+}, Symbol.toStringTag, { value: "Module" })), lu = "/kos-timer-event", uu = "/kos-timer-event/tick", du = "defaultTimerEnd", vs = m.createLogger({ name: "timer-manager" }), cw = (t) => t.updateProperty !== void 0;
 class lw {
   /**
    * Creates a new timer.
@@ -16957,7 +16957,7 @@ class lw {
     this.name = e;
     const n = typeof s == "number" ? s : s.value || 60;
     this.timeout = n, this.state = "inactive", this.remainingTime = n, cw(s) && ee(() => {
-      g.info(
+      m.info(
         `Updating config value timer ${e} with new timeout value ${s.value}`
       );
       const o = s.value || 60;
@@ -17165,7 +17165,7 @@ function pu(t, e, s = {}) {
   } = s;
   return async function(...a) {
     const c = ss();
-    g.debug(
+    m.debug(
       `Calling future service ${e} with tracker ${c}`
     );
     let u, d;
@@ -17174,37 +17174,37 @@ function pu(t, e, s = {}) {
       tracker: c,
       id: vc
     });
-    n && (h.namespace = n), g.debug(`waiting for future ${h.id} to be ready`), await Te(h), g.debug(`future ${h.id} is ready`), ae(() => {
-      g.debug(`Adding future ${h.id} to futureHandler`), this.futureHandler.addFuture(h, r);
+    n && (h.namespace = n), m.debug(`waiting for future ${h.id} to be ready`), await Te(h), m.debug(`future ${h.id} is ready`), ae(() => {
+      m.debug(`Adding future ${h.id} to futureHandler`), this.futureHandler.addFuture(h, r);
     }), o && u && (d = ee(() => {
-      (h.status === "CANCELLED" || h.endState === wt.Canceled) && (g.debug(`Future ${h.id} cancelled, aborting request`), u == null || u.abort());
+      (h.status === "CANCELLED" || h.endState === wt.Canceled) && (m.debug(`Future ${h.id} cancelled, aborting request`), u == null || u.abort());
     }), u.signal.addEventListener(
       "abort",
       async () => {
         if (h.status !== "CANCELLED" && h.endState !== wt.Canceled && !h.endState) {
-          g.debug(
+          m.debug(
             `AbortController aborted, cancelling future ${h.id}`
           );
           try {
             await h.cancelFuture();
-          } catch (p) {
-            g.error(`Failed to cancel future ${h.id}:`, p);
+          } catch (f) {
+            m.error(`Failed to cancel future ${h.id}:`, f);
           }
         }
       },
       { once: !0 }
     ));
-    const f = () => {
+    const p = () => {
       d && (d(), d = void 0);
     };
     try {
-      const p = [...a];
+      const f = [...a];
       if (o && u) {
-        const v = p[p.length - 1];
-        v && typeof v == "object" && "aborted" in v ? p[p.length - 1] = u.signal : p.push(u.signal);
+        const v = f[f.length - 1];
+        v && typeof v == "object" && "aborted" in v ? f[f.length - 1] = u.signal : f.push(u.signal);
       }
       if (i === "context") {
-        const v = p[p.length - 1];
+        const v = f[f.length - 1];
         if (Wa(v))
           v.$tracker = c;
         else {
@@ -17212,25 +17212,25 @@ function pu(t, e, s = {}) {
             [Mo]: !0,
             $tracker: c
           };
-          p.push(_);
+          f.push(_);
         }
       } else
-        p.push(c);
-      const m = (
+        f.push(c);
+      const g = (
         // eslint-disable-next-line no-invalid-this
-        await t.apply(this, p)
+        await t.apply(this, f)
       );
-      g.debug(`received future response for ${c}`, m);
-      const y = hw(m) ? m : m == null ? void 0 : m.data;
-      return y ? (y.progress = 1, g.debug("mapping future response to future model"), h.endState ? g.debug(
+      m.debug(`received future response for ${c}`, g);
+      const y = hw(g) ? g : g == null ? void 0 : g.data;
+      return y ? (y.progress = 1, m.debug("mapping future response to future model"), h.endState ? m.debug(
         `future ${h.id} has already completed.  Not updating the model`
-      ) : Cc(y, h)) : this.futureHandler.removeFuture(r), f(), y;
-    } catch (p) {
-      if (f(), o && (u != null && u.signal.aborted)) {
-        const m = new Error("Operation cancelled");
-        throw g.debug(`Operation ${e} was cancelled`), m;
+      ) : Cc(y, h)) : this.futureHandler.removeFuture(r), p(), y;
+    } catch (f) {
+      if (p(), o && (u != null && u.signal.aborted)) {
+        const g = new Error("Operation cancelled");
+        throw m.debug(`Operation ${e} was cancelled`), g;
       }
-      throw g.error(p), p;
+      throw m.error(f), f;
     }
   };
 }
@@ -17273,7 +17273,7 @@ function pT(t) {
     };
   };
 }
-const Ht = g.createLogger({ name: "services", group: "Services" }), gT = async (t, e) => fw(t, e, `${we}/api/server/login`), fw = async (t, e, s = `${we}/api/login`) => {
+const Ht = m.createLogger({ name: "services", group: "Services" }), gT = async (t, e) => fw(t, e, `${we}/api/server/login`), fw = async (t, e, s = `${we}/api/login`) => {
   const r = await Ue(`${s}`, {
     method: "POST",
     destinationAddress: "",
@@ -17357,12 +17357,12 @@ function vT(t, e, s, r) {
     cancelFuture: a,
     future: c
   } = n, u = o;
-  let d = 0, h = "PENDING", f = !0;
-  const p = /* @__PURE__ */ new Set();
-  let m;
-  return c && typeof c == "object" && (m = Xt(() => {
+  let d = 0, h = "PENDING", p = !0;
+  const f = /* @__PURE__ */ new Set();
+  let g;
+  return c && typeof c == "object" && (g = Xt(() => {
     const y = c.progress || 0, v = c.status || "PENDING", _ = !c.endState;
-    (y !== d || v !== h || _ !== f) && (d = y, h = v, f = _, p.forEach((U) => {
+    (y !== d || v !== h || _ !== p) && (d = y, h = v, p = _, f.forEach((U) => {
       try {
         U(d, h);
       } catch (D) {
@@ -17370,21 +17370,21 @@ function vT(t, e, s, r) {
       }
     }));
   })), o.finally(() => {
-    f = !1, i != null && i.signal.aborted || (h = "COMPLETED", p.forEach((y) => {
+    p = !1, i != null && i.signal.aborted || (h = "COMPLETED", f.forEach((y) => {
       try {
         y(d, h);
       } catch (v) {
         console.warn("Progress callback error:", v);
       }
-    })), m && m(), p.clear();
+    })), g && g(), f.clear();
   }), u.cancel = async () => {
-    i && !i.signal.aborted && i.abort(), a && await a(), f = !1, h = "CANCELLED", p.forEach((y) => {
+    i && !i.signal.aborted && i.abort(), a && await a(), p = !1, h = "CANCELLED", f.forEach((y) => {
       try {
         y(d, h);
       } catch (v) {
         console.warn("Progress callback error:", v);
       }
-    }), m && m();
+    }), g && g();
   }, u.getController = () => i, u.isCancelled = () => (i == null ? void 0 : i.signal.aborted) ?? !1, Object.defineProperty(u, "progress", {
     get: () => d,
     enumerable: !0
@@ -17392,9 +17392,9 @@ function vT(t, e, s, r) {
     get: () => h,
     enumerable: !0
   }), Object.defineProperty(u, "isRunning", {
-    get: () => f,
+    get: () => p,
     enumerable: !0
-  }), u.onProgressUpdate = (y) => (p.add(y), y(d, h), () => p.delete(y)), u;
+  }), u.onProgressUpdate = (y) => (f.add(y), y(d, h), () => f.delete(y)), u;
 }
 const yw = ju`
   0% {
@@ -17531,7 +17531,7 @@ const _w = {
     [s]
   );
   return /* @__PURE__ */ w(ti.Provider, { value: { model: e, setModel: r }, children: t });
-}, gu = g.createLogger({ name: "kos-model-hierarchy-context" }), Sw = {
+}, gu = m.createLogger({ name: "kos-model-hierarchy-context" }), Sw = {
   models: [],
   addModel: () => {
     gu.debug("Default implementation being used. Do Nothing.");
@@ -17560,7 +17560,7 @@ const _w = {
     const r = Ve(s.id);
     return (r == null ? void 0 : r.type) === t;
   }
-})[0], Cw = g.createLogger({ name: "kos-model-loader" }), Dw = () => /* @__PURE__ */ w("div", {}), xw = ({ fallback: t, children: e, ...s }) => /* @__PURE__ */ w($w, { children: /* @__PURE__ */ w(Mw, { fallback: t, children: /* @__PURE__ */ w(Bu, { children: /* @__PURE__ */ w(Aw, { ...s, children: e }) }) }) }), Aw = (t) => {
+})[0], Cw = m.createLogger({ name: "kos-model-loader" }), Dw = () => /* @__PURE__ */ w("div", {}), xw = ({ fallback: t, children: e, ...s }) => /* @__PURE__ */ w($w, { children: /* @__PURE__ */ w(Mw, { fallback: t, children: /* @__PURE__ */ w(Bu, { children: /* @__PURE__ */ w(Aw, { ...s, children: e }) }) }) }), Aw = (t) => {
   const [e, s] = E(), [r, n] = E(!1), { setModel: o } = bt(ti), i = bt(si);
   if (S(() => {
     t.model && (s(t.model), o(t.model), n(!0), i && i.addModel(t.model));
@@ -17669,42 +17669,42 @@ const oe = (t) => {
   return S(() => {
     t.forceUpdate && h && To(h) && h.updateModel(t.options || {});
   }, [h]), S(() => {
-    async function f() {
+    async function p() {
       try {
         return await o.kosCore.whenReady(), r && await (d == null ? void 0 : d.fsm.transitionTo(
           k.GO_ACTIVE,
           b.ACTIVE
         )), a(!0), d;
-      } catch (m) {
-        throw u(m.message), m;
+      } catch (g) {
+        throw u(g.message), g;
       }
     }
-    let p;
-    return o.kosCore && e && f().then((m) => {
-      p = ee(() => {
-        const y = (m == null ? void 0 : m.status) === b.READY;
+    let f;
+    return o.kosCore && e && p().then((g) => {
+      f = ee(() => {
+        const y = (g == null ? void 0 : g.status) === b.READY;
         a(y);
       });
-    }).catch((m) => {
-      console.error(m);
+    }).catch((g) => {
+      console.error(g);
     }), () => {
       if (r) {
         if (h != null && h.id) {
-          const m = o.kosCore.modelManager.getModelById(
+          const g = o.kosCore.modelManager.getModelById(
             h.id
           );
-          m == null || m.fsm.transitionTo(k.GO_INACTIVE, b.INACTIVE).then(() => {
+          g == null || g.fsm.transitionTo(k.GO_INACTIVE, b.INACTIVE).then(() => {
             if (n) {
               const y = h.id;
               qe(h).then(() => {
-                pt.delete(y), p == null || p();
+                pt.delete(y), f == null || f();
               });
             }
           });
         }
       } else
         n && h && qe(h).then(() => {
-          pt.delete(e), p == null || p();
+          pt.delete(e), f == null || f();
         });
     };
   }, [
@@ -17781,12 +17781,12 @@ const Mu = Us(void 0), Hw = () => {
   rootUrl: n,
   descriptorResolver: o
 }) => {
-  const [i, a] = E(!1), [c, u] = E(), [d, h] = E(), f = n || Hw(), p = Y(() => e ?? "app/system", [e]);
+  const [i, a] = E(!1), [c, u] = E(), [d, h] = E(), p = n || Hw(), f = Y(() => e ?? "app/system", [e]);
   S(() => {
     async function v() {
-      const U = (Array.isArray(p) ? p : [p]).map((se) => (o || Kb(se))()), L = (await Promise.allSettled(U)).map((se) => {
+      const U = (Array.isArray(f) ? f : [f]).map((se) => (o || Kb(se))()), L = (await Promise.allSettled(U)).map((se) => {
         if (se.status === "rejected") {
-          g.warn("Failed to load localization descriptor", se.reason);
+          m.warn("Failed to load localization descriptor", se.reason);
           return;
         }
         return se.value;
@@ -17803,10 +17803,10 @@ const Mu = Us(void 0), Hw = () => {
       u(L);
     }
     v();
-  }, [p, o]), S(() => {
+  }, [f, o]), S(() => {
     async function v() {
       if (c) {
-        const _ = f, { translations: U } = await ev.init({
+        const _ = p, { translations: U } = await ev.init({
           lang: s,
           descriptor: c,
           defaultNamespace: "common",
@@ -17817,8 +17817,8 @@ const Mu = Us(void 0), Hw = () => {
       }
     }
     v();
-  }, [s, c, r, f]);
-  const m = Y(() => i ? {
+  }, [s, c, r, p]);
+  const g = Y(() => i ? {
     setLocale: (v) => {
       d && (d.currentLocale = v);
     }
@@ -17827,7 +17827,7 @@ const Mu = Us(void 0), Hw = () => {
       throw new Error("Translations not ready");
     }
   }, [i, d]), y = i ? t : null;
-  return /* @__PURE__ */ w(Mu.Provider, { value: m, children: y });
+  return /* @__PURE__ */ w(Mu.Provider, { value: g, children: y });
 }, PT = () => {
   const t = bt(Mu);
   if (!t)
@@ -17868,7 +17868,7 @@ function Kw({
   const u = c.getContext("2d");
   u == null || u.putImageData(a, 0, 0), t.imageSmoothingEnabled = !1, t.clearRect(0, 0, r * o, n * o), t.drawImage(c, 0, 0, r * o, n * o);
 }
-const Gw = g.createLogger({ name: "canvas-streamer" });
+const Gw = m.createLogger({ name: "canvas-streamer" });
 Gw.debug("main-view component loaded");
 const Un = 10, Yw = pa(
   ({
@@ -17894,9 +17894,9 @@ const Un = 10, Yw = pa(
     const d = re(
       (h) => {
         if (a.current && n) {
-          const f = a.current.getContext("2d");
-          f && Kw({
-            ctx: f,
+          const p = a.current.getContext("2d");
+          p && Kw({
+            ctx: p,
             format: "base64",
             dataString: h,
             height: e,
@@ -18021,8 +18021,8 @@ const BT = (t) => {
     async function d(h) {
       try {
         h && (await Te(h), o(!0));
-      } catch (f) {
-        a(f.message);
+      } catch (p) {
+        a(p.message);
       }
     }
     d(e);
@@ -18056,7 +18056,7 @@ function HT(t) {
     return /* @__PURE__ */ w(n, { ...r, children: /* @__PURE__ */ w(t, { ...e, storageDeviceContainer: s }) });
   };
 }
-const jn = g.createLogger({ name: "use-timer" }), qT = ({
+const jn = m.createLogger({ name: "use-timer" }), qT = ({
   timerName: t,
   onTimerExpired: e,
   onTimerTick: s,
@@ -18070,8 +18070,8 @@ const jn = g.createLogger({ name: "use-timer" }), qT = ({
       return;
     }
     const u = I(lu, (d) => {
-      const { name: h, action: f, remainingTime: p } = d == null ? void 0 : d.body;
-      h === t && (f === du ? e({ name: h, action: f, remainingTime: p, timer: o }) : r != null && r[f] && r[f]({ name: h, action: f, remainingTime: p, timer: o }));
+      const { name: h, action: p, remainingTime: f } = d == null ? void 0 : d.body;
+      h === t && (p === du ? e({ name: h, action: p, remainingTime: f, timer: o }) : r != null && r[p] && r[p]({ name: h, action: p, remainingTime: f, timer: o }));
     });
     return n && o.start(), () => {
       u.unsubscribe();
@@ -18080,8 +18080,8 @@ const jn = g.createLogger({ name: "use-timer" }), qT = ({
     if (!o || !s)
       return;
     const u = `${uu}/${t}`, d = I(u, (h) => {
-      const { name: f, remainingTime: p } = h == null ? void 0 : h.body;
-      f === t && s({ name: f, remainingTime: p, timer: o });
+      const { name: p, remainingTime: f } = h == null ? void 0 : h.body;
+      p === t && s({ name: p, remainingTime: f, timer: o });
     });
     return () => {
       d.unsubscribe();
@@ -18181,10 +18181,10 @@ const lE = async () => {
   }), [e == null ? void 0 : e.keyPrefix, a]);
   return { t: re(
     (d, h) => {
-      const f = e != null && e.keyPrefix ? `${e.keyPrefix}.${d}` : d;
-      return a ? a.resolveKey(f, h) : (g.debug(
-        `Translation model ${t} not ready for key: ${f}`
-      ), f);
+      const p = e != null && e.keyPrefix ? `${e.keyPrefix}.${d}` : d;
+      return a ? a.resolveKey(p, h) : (m.debug(
+        `Translation model ${t} not ready for key: ${p}`
+      ), p);
     },
     [e == null ? void 0 : e.keyPrefix, t, a]
   ), i18n: c };
@@ -18264,16 +18264,16 @@ const ZT = ({ path: t, propKey: e }) => {
     options: {
       path: t
     }
-  }), [r, n] = E(!1), [o, i] = E(), [a, c] = E(""), [u, d] = E(), h = (f) => {
-    o && e && o.updateProperty(e, f);
+  }), [r, n] = E(!1), [o, i] = E(), [a, c] = E(""), [u, d] = E(), h = (p) => {
+    o && e && o.updateProperty(e, p);
   };
   return S(() => {
-    var f;
-    s.model && i(s.model), s.model && e && ((f = s.model) != null && f.props.has(e) ? c(s.model.props[e]) : d(`property ${e} not found`)), s.ready && n(s.ready);
+    var p;
+    s.model && i(s.model), s.model && e && ((p = s.model) != null && p.props.has(e) ? c(s.model.props[e]) : d(`property ${e} not found`)), s.ready && n(s.ready);
   }, [s.ready, s.model, e]), S(() => {
     e && Xt(() => {
-      const f = o == null ? void 0 : o.props[e];
-      c(f || "");
+      const p = o == null ? void 0 : o.props[e];
+      c(p || "");
     });
   }, [o, e]), {
     config: o,
@@ -18444,15 +18444,15 @@ function ME({
     dayFormat: a = "short"
   } = {}
 }) {
-  const c = $u(o, r), u = _E(o, r, t), d = TE(i, t), h = $E(i, t), f = Su(e, s), p = IE(e, s, t, n), m = DE(s, e, p), y = OE(t, a);
+  const c = $u(o, r), u = _E(o, r, t), d = TE(i, t), h = $E(i, t), p = Su(e, s), f = IE(e, s, t, n), g = DE(s, e, f), y = OE(t, a);
   return {
-    daysArray: f,
+    daysArray: p,
     monthsArray: d,
     yearsArray: c,
     yearsOptionsArray: u,
     monthsOptionsArray: h,
-    daysOptionsArray: p,
-    calendarDayArray: m,
+    daysOptionsArray: f,
+    calendarDayArray: g,
     dayNamesArray: y
   };
 }
@@ -18557,7 +18557,7 @@ function t$({
     daysOfWeekFilter: u = []
   } = {}
 }) {
-  const [d, h] = E(e), [f, p] = E(c), [m, y] = E(s), [v, _] = E(r);
+  const [d, h] = E(e), [p, f] = E(c), [g, y] = E(s), [v, _] = E(r);
   S(() => {
     h(e);
   }, [e]), S(() => {
@@ -18577,8 +18577,8 @@ function t$({
   } = ME({
     locale: t,
     year: d,
-    yearRange: f,
-    month: m,
+    yearRange: p,
+    month: g,
     formatOptions: {
       yearFormat: n,
       monthFormat: o,
@@ -18587,18 +18587,18 @@ function t$({
     daysOfWeekFilter: u
   }), { formattedDate: ie } = CE({
     year: d,
-    month: m,
+    month: g,
     day: v,
     formatString: a
   });
   return {
     dateActions: {
       setYear: h,
-      setYearRange: p,
+      setYearRange: f,
       setMonth: y,
       setDay: _,
       nextMonth: () => {
-        const le = m < 11 ? Re(d) : Re(d + 1), me = m < 11 ? m + 1 : 0;
+        const le = g < 11 ? Re(d) : Re(d + 1), me = g < 11 ? g + 1 : 0;
         if (!lr(le, me, v)) {
           const it = ur(le, me);
           _(it);
@@ -18606,7 +18606,7 @@ function t$({
         me === 0 && h(le), y(me);
       },
       previousMonth: () => {
-        const le = Re(m === 0 ? d - 1 : d), me = m === 0 ? 11 : m - 1;
+        const le = Re(g === 0 ? d - 1 : d), me = g === 0 ? 11 : g - 1;
         if (!lr(le, me, v)) {
           const it = ur(le, me);
           _(it);
@@ -18614,28 +18614,28 @@ function t$({
         me === 11 && h(le), y(me);
       },
       nextYear: () => {
-        const le = d < f[1] ? d + 1 : f[0], me = Re(le);
-        if (lr(me, m, v))
+        const le = d < p[1] ? d + 1 : p[0], me = Re(le);
+        if (lr(me, g, v))
           h(le);
         else {
-          const it = ur(Re(d + 1), m);
+          const it = ur(Re(d + 1), g);
           _(it), h(le);
         }
       },
       previousYear: () => {
-        const le = d > f[0] ? d - 1 : f[0], me = Re(le);
-        if (lr(me, m, v))
+        const le = d > p[0] ? d - 1 : p[0], me = Re(le);
+        if (lr(me, g, v))
           h(le);
         else {
-          const it = ur(Re(d - 1), m);
+          const it = ur(Re(d - 1), g);
           _(it), h(le);
         }
       }
     },
     dateState: {
       year: d,
-      yearRange: f,
-      month: m,
+      yearRange: p,
+      month: g,
       day: v,
       yearsArray: U,
       yearsOptionsArray: D,
@@ -18686,11 +18686,11 @@ const PE = ({
     }
   });
   return S(() => {
-    const d = Number(t), h = Math.floor(d / 3600), f = Math.floor(d % 3600 / 60), p = d % 60;
-    s(h), n(f), i(p);
-    const m = /* @__PURE__ */ new Date();
-    m.setHours(0, 0, 0, 0);
-    const y = new Date(m.getTime() + d * 1e3);
+    const d = Number(t), h = Math.floor(d / 3600), p = Math.floor(d % 3600 / 60), f = d % 60;
+    s(h), n(p), i(f);
+    const g = /* @__PURE__ */ new Date();
+    g.setHours(0, 0, 0, 0);
+    const y = new Date(g.getTime() + d * 1e3);
     c(new Date(y));
   }, [t]), {
     hours: e,
@@ -18934,7 +18934,7 @@ function c$(t, e, s = BE) {
     try {
       r.observe(t, o);
     } catch (i) {
-      g.error(i);
+      m.error(i);
     }
     return () => {
       r && r.disconnect();
@@ -18949,7 +18949,7 @@ const HE = {
     const e = t.event.currentTarget.getBoundingClientRect(), [s, r] = t.xy;
     return s < e.left || s > e.right || r < e.top || r > e.bottom;
   }
-}, Bn = g.createLogger({
+}, Bn = m.createLogger({
   name: "usePressGesture",
   group: "kos-hooks"
 });
@@ -19075,16 +19075,16 @@ function YE({
   }, []), u = re((y) => {
     const v = new Date(y);
     o(v);
-  }, []), d = GE(n, r), { hourOptions: h, minuteOptions: f, secondOptions: p, amPmOptions: m } = KE({
+  }, []), d = GE(n, r), { hourOptions: h, minuteOptions: p, secondOptions: f, amPmOptions: g } = KE({
     formatOptions: t,
     locale: s
   });
   return {
-    amPmOptions: m,
+    amPmOptions: g,
     formattedTime: d,
     hourOptions: h,
-    minuteOptions: f,
-    secondOptions: p,
+    minuteOptions: p,
+    secondOptions: f,
     setHours: i,
     setMinutes: a,
     setSeconds: c,
@@ -19104,20 +19104,20 @@ const u$ = (t) => {
 function d$(t, e, s = {}) {
   const { disposeOnUnmount: r = !0 } = s, [n, o] = E(!1), [i, a] = E(void 0), c = mt(null), u = mt(!0), d = mt(!1), h = Y(() => {
     if (!u.current && c.current && r && Cn(c.current)) {
-      const p = c.current;
+      const f = c.current;
       Promise.resolve().then(() => {
-        Cn(p) && p.dispose();
+        Cn(f) && f.dispose();
       });
     }
     u.current = !1, d.current = !1;
-    const f = t();
-    return c.current = f, f;
+    const p = t();
+    return c.current = p, p;
   }, e);
   return S(() => {
     d.current || (Hh(h) ? (d.current = !0, o(!1), a(void 0), h.ready().then(() => {
       o(!0);
-    }).catch((f) => {
-      a(f), o(!1);
+    }).catch((p) => {
+      a(p), o(!1);
     })) : (o(!0), a(void 0)));
   }, [h]), S(
     () => () => {
@@ -19132,7 +19132,7 @@ function h$(t) {
     return s ? /* @__PURE__ */ w(ww, { message: "Wait a moment while your project reloads..." }) : /* @__PURE__ */ w(t, { ...e });
   };
 }
-const ca = g.createLogger({
+const ca = m.createLogger({
   name: "studio-properties-service",
   group: "Services"
 }), WE = "/api/kos/studio/properties", xu = async (t) => {
@@ -19214,7 +19214,7 @@ let co = class {
     }
     if (e) {
       const s = Object.keys(e).reduce((r, n) => (r[n] = e[n] ?? n, r), {});
-      this.data.setValues(s ?? la), g.ifDebug(
+      this.data.setValues(s ?? la), m.ifDebug(
         () => this.logger.debug(`studio-properties loaded: ${JSON.stringify(s)}`)
       );
     }
@@ -19335,7 +19335,7 @@ export {
   Zd as KosFetchMethods,
   Fa as KosGlobalConfig,
   ac as KosHttpRouteManager,
-  g as KosLog,
+  m as KosLog,
   Uy as KosLogManager,
   H_ as KosLogManagerServices,
   Qa as KosLoggerFactory,