@kosdev-code/kos-freestyle-sdk 0.1.0-dev.5077 → 0.1.0-dev.5092

package/{freestyle-registration-manager-z0aYdMcC.js → freestyle-registration-manager-CymJYnwk.js}

@@ -1,49 +1,233 @@
-var Le = Object.defineProperty;
-var Fe = (e, t, r) => t in e ? Le(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var o = (e, t, r) => (Fe(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as f, KosModelRegistrationFactory as b, KosModelContainer as Ge, kosChild as de, resolveServiceUrl as F, ServiceFactory as G, createPropKey as j, kosStateProp as J, kosFuture as U, kosModelEffect as k, kosFutureAware as je, kosLoggerAware as ce, EventBus as M, SingletonKosModelRegistrationFactory as ee, kosParentAware as ge, KosFeatureFlags as H, kosConfigProperty as p, getKosModelSync as v, kosContainerAware as Ue, KosContextManager as Be, KosLog as $, FutureManager as xe, kosAction as w, FetchError as He, KOS_MODEL_ID as m, kosMultipleFutureAware as Ke, kosTopicHandler as Ye, DependencyLifecycle as qe, modelTypeEventTopicFactory as Ve, RegistrationManager as h, registerCoreModels as We, Trouble as Ze, ExtensionManager as K, EXTENSION_TROUBLE_DATA_MAPPER as Y } from "@kosdev-code/kos-ui-sdk";
-import { PourState as c, Assembly as ue, KosModelRegistry as Qe, registerDispenseModels as Xe, Nozzle as Je, Pump as ke, Holder as et, PumpContainer as tt, PumpIndex as rt } from "@kosdev-code/kos-dispense-sdk";
-var at = Object.getOwnPropertyDescriptor, ot = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? at(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = n(a) || a);
-  return a;
+var ke = Object.defineProperty;
+var xe = (e, t, r) => t in e ? ke(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var o = (e, t, r) => (xe(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { resolveServiceUrl as M, ServiceFactory as D, KosLog as C, createPropKey as R, kosStateProp as O, kosConfigProperty as y, kosStateEntry as ee, kosStateExit as He, kosStateGuard as te, kosFuture as N, kosModel as b, kosLoggerAware as re, kosCompanion as Ve, kosFutureAware as pe, kosStateMachine as Ye, DependencyLifecycle as ye, KosModelContainer as qe, kosChild as fe, kosModelEffect as ae, EventBus as F, KosModelRegistrationFactory as _, SingletonKosModelRegistrationFactory as oe, kosParentAware as me, KosFeatureFlags as V, getKosCompanionModel as Ze, getKosModelSync as v, kosContainerAware as We, KosContextManager as Qe, FutureManager as Xe, kosAction as L, FetchError as Je, KOS_MODEL_ID as I, kosMultipleFutureAware as et, kosTopicHandler as tt, modelTypeEventTopicFactory as rt, RegistrationManager as p, registerCoreModels as at, Trouble as ot, ExtensionManager as Y, EXTENSION_TROUBLE_DATA_MAPPER as q } from "@kosdev-code/kos-ui-sdk";
+import { PourState as c, Assembly as be, KosModelRegistry as it, registerDispenseModels as st, Nozzle as nt, Pump as lt, Holder as dt, PumpContainer as ct, PumpIndex as ut } from "@kosdev-code/kos-dispense-sdk";
+const { URL: Ie } = M("ICE_AGITATOR_SERVICE"), { postModel: gt } = D.build({
+  basePath: `${Ie}/api/ext/freestyle/ice`
+});
+C.createLogger({
+  name: "carb-tank-service",
+  group: "Services"
+});
+const ht = async (e, t) => {
+  const r = await gt({
+    model: {},
+    tracker: t,
+    urlOverride: `${Ie}/api/handle/${e}/test`
+  });
+  if (!(r != null && r.data))
+    throw new Error("No response from server");
+  return r == null ? void 0 : r.data;
 };
-const he = "carb-agitator-model";
-let V = class {
+var Pe = Object.defineProperty, pt = Object.getOwnPropertyDescriptor, yt = (e, t, r) => t in e ? Pe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, f = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? pt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && Pe(t, r, a), a;
+}, ft = (e, t, r) => (yt(e, t + "", r), r);
+const mt = "carb-agitator-model", ie = R("statePath");
+let g = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "name");
     o(this, "path");
-    o(this, "logger");
-    this.id = e, this.name = t.name, this.path = t.path, this.logger = r.logger;
+    o(this, "statePath");
+    o(this, "highProbeWet");
+    o(this, "lowProbeWet");
+    o(this, "filling");
+    o(this, "enabled");
+    var a;
+    this.id = e, this.name = t.name, this.path = ((a = r.kosContext.get("assembly-feature-carbTank")) == null ? void 0 : a.path) || "";
+    const i = r.kosContext.get("assembly-state-path-carbTank");
+    this.statePath = i;
   }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing carb-agitator ${this.id}`);
+  get holder() {
+    var t;
+    return (t = this.getCompanionParent()) == null ? void 0 : t.getHoldersByGroup("carb")[0];
   }
-  async load() {
-    this.logger.debug(`loading carb-agitator ${this.id}`);
+  get pump() {
+    var e;
+    return (e = this.holder) == null ? void 0 : e.pumps.data[0];
+  }
+  get isFilling() {
+    return !!this.filling.value;
+  }
+  get isCarbInitialized() {
+    return !!this.enabled.value;
+  }
+  get canActivate() {
+    return !this.enabled.value;
+  }
+  get canProceed() {
+    return this.isInState(
+      "INITIALIZED"
+      /* INITIALIZED */
+    ) || this.isInState(
+      "SKIPPED"
+      /* SKIPPED */
+    );
+  }
+  handleActivationStart() {
+    this.logger.info("Carb tank activation started");
+  }
+  handleActivationComplete() {
+    this.logger.info("Carb tank initialized");
+  }
+  handleInitialized() {
+    this.logger.info("Carb tank ready to proceed");
+  }
+  handleSkipped() {
+    this.logger.info("Proceeding without carbinator");
+  }
+  async activateCarbTank() {
+    this.transition("ACTIVATE"), this.enabled.updateProperty(!0), this.transition("ACTIVATION_COMPLETE");
+  }
+  async deactivateCarbTank() {
+    this.enabled.updateProperty(!1), this.transition("RESET");
+  }
+  skip() {
+    this.transition("SKIP");
+  }
+  reset() {
+    this.enabled.updateProperty(!1), this.transition("RESET");
+  }
+  toggleCarbTank() {
+    this.enabled.value ? this.deactivateCarbTank() : this.activateCarbTank();
+  }
+  handleTestCarbTank(e) {
+    if (!e)
+      throw new Error("No tracker provided");
+    return this.logger.info(`testing carb tank:  ${this.id}`), ht(this.path, e);
   }
 };
-V = ot([
-  f(he)
-], V);
-const pe = new b({
-  class: V,
-  type: he
-});
-var st = Object.defineProperty, it = Object.getOwnPropertyDescriptor, ye = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? it(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && st(t, r, a), a;
+ft(g, "Registration");
+f([
+  O({
+    path: ie,
+    attribute: "highProbeWet"
+  })
+], g.prototype, "highProbeWet", 2);
+f([
+  O({
+    path: ie,
+    attribute: "lowProbeWet"
+  })
+], g.prototype, "lowProbeWet", 2);
+f([
+  O({
+    path: ie,
+    attribute: "filling"
+  })
+], g.prototype, "filling", 2);
+f([
+  y({
+    path: "assembly:core:board:macksm:carbTank:carbTank",
+    attribute: "enabled"
+  })
+], g.prototype, "enabled", 2);
+f([
+  ee(
+    "ACTIVATING"
+    /* ACTIVATING */
+  )
+], g.prototype, "handleActivationStart", 1);
+f([
+  He(
+    "ACTIVATING"
+    /* ACTIVATING */
+  )
+], g.prototype, "handleActivationComplete", 1);
+f([
+  ee(
+    "INITIALIZED"
+    /* INITIALIZED */
+  )
+], g.prototype, "handleInitialized", 1);
+f([
+  ee(
+    "SKIPPED"
+    /* SKIPPED */
+  )
+], g.prototype, "handleSkipped", 1);
+f([
+  te({ allowedStates: [
+    "UNINITIALIZED"
+    /* UNINITIALIZED */
+  ] })
+], g.prototype, "activateCarbTank", 1);
+f([
+  te({ allowedStates: [
+    "UNINITIALIZED"
+    /* UNINITIALIZED */
+  ] })
+], g.prototype, "skip", 1);
+f([
+  te({
+    allowedStates: [
+      "INITIALIZED",
+      "SKIPPED"
+      /* SKIPPED */
+    ]
+  })
+], g.prototype, "reset", 1);
+f([
+  N()
+], g.prototype, "handleTestCarbTank", 1);
+g = f([
+  b({ modelTypeId: mt, singleton: !1 }),
+  re(),
+  Ve({ mode: "composition", lifecycle: ye.LOAD }),
+  pe(),
+  Ye(
+    {
+      initial: "UNINITIALIZED",
+      states: {
+        UNINITIALIZED: {
+          on: {
+            ACTIVATE: "ACTIVATING",
+            SKIP: "SKIPPED"
+            /* SKIPPED */
+          }
+        },
+        ACTIVATING: {
+          on: {
+            ACTIVATION_COMPLETE: "INITIALIZED"
+            /* INITIALIZED */
+          }
+        },
+        INITIALIZED: {
+          on: {
+            RESET: "UNINITIALIZED"
+            /* UNINITIALIZED */
+          }
+        },
+        SKIPPED: {
+          on: {
+            RESET: "UNINITIALIZED"
+            /* UNINITIALIZED */
+          }
+        }
+      }
+    },
+    {
+      throwOnInvalid: !1
+      // Graceful handling for button clicks
+    }
+  )
+], g);
+const Te = g.Registration;
+var bt = Object.defineProperty, It = Object.getOwnPropertyDescriptor, ve = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? It(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && bt(t, r, a), a;
 };
-const fe = "cartridge-agitator-container-model";
-let S = class {
+const _e = "cartridge-agitator-container-model";
+let G = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
     o(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new Ge({
+    this.id = e, this.logger = r.logger, this._models = new qe({
       parentId: e
     });
   }
@@ -74,35 +258,35 @@ let S = class {
     );
   }
 };
-ye([
-  de
-], S.prototype, "_models", 2);
-S = ye([
-  f(fe)
-], S);
-const { URL: me } = F("CARTRIDGE_AGITATOR_SERVICE"), { postModel: nt } = G.build({
-  basePath: `${me}/api/ext/freestyle/freestyle/ice`
-}), lt = async (e, t) => {
-  const r = await nt({
+ve([
+  fe
+], G.prototype, "_models", 2);
+G = ve([
+  b(_e)
+], G);
+const { URL: Ee } = M("CARTRIDGE_AGITATOR_SERVICE"), { postModel: Pt } = D.build({
+  basePath: `${Ee}/api/ext/freestyle/freestyle/ice`
+}), Tt = async (e, t) => {
+  const r = await Pt({
     model: {},
     tracker: t,
-    urlOverride: `${me}/api/handle/${e}/test`
+    urlOverride: `${Ee}/api/handle/${e}/test`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
 };
-var dt = Object.defineProperty, ct = Object.getOwnPropertyDescriptor, B = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? ct(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && dt(t, r, a), a;
+var vt = Object.defineProperty, _t = Object.getOwnPropertyDescriptor, x = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? _t(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && vt(t, r, a), a;
 };
-const Pe = "cartridge-agitator-model";
-class R {
+const Ae = "cartridge-agitator-model";
+class U {
 }
-o(R, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), o(R, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
-const gt = j("statePath");
-let T = class {
+o(U, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), o(U, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
+const Et = R("statePath");
+let A = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "agitating");
@@ -117,51 +301,52 @@ let T = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating cartridge-agitator ${this.id}`), lt(this.path, e);
+    return this.logger.info(`agitating cartridge-agitator ${this.id}`), Tt(this.path, e);
   }
   handleAgitation() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), M.publish(R.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), F.publish(U.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.future) == null ? void 0 : e.futureId
-    })) : M.publish(R.TOPIC_AGITATION_ENDED, {
+    })) : F.publish(U.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
 };
-B([
-  J({ path: gt, attribute: "agitating" })
-], T.prototype, "agitating", 2);
-B([
-  U()
-], T.prototype, "testAgitate", 1);
-B([
-  k({
+x([
+  O({ path: Et, attribute: "agitating" })
+], A.prototype, "agitating", 2);
+x([
+  N()
+], A.prototype, "testAgitate", 1);
+x([
+  ae({
     dependencies: (e) => [e.isAgitating]
   })
-], T.prototype, "handleAgitation", 1);
-T = B([
-  f(Pe),
-  je(),
-  ce()
-], T);
-const be = new b({
-  class: T,
-  type: Pe
-}), te = new ee({
-  class: S,
-  type: fe
+], A.prototype, "handleAgitation", 1);
+A = x([
+  b(Ae),
+  pe(),
+  re()
+], A);
+const Ce = new _({
+  class: A,
+  type: Ae
+}), se = new oe({
+  class: G,
+  type: _e
 });
-te.addRelatedModel(be);
-var ut = Object.defineProperty, ht = Object.getOwnPropertyDescriptor, _e = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? ht(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && ut(t, r, a), a;
+se.addRelatedModel(Ce);
+var At = Object.defineProperty, Ct = Object.getOwnPropertyDescriptor, Oe = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Ct(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && At(t, r, a), a;
 };
-const ve = "freestyle-assembly-model", pt = "iceAgitator", yt = "carbAgitator", ft = "remoteTrays";
-let D = class {
+const $e = "freestyle-assembly-model", Ot = "iceAgitator", $t = "carbTank", wt = "remoteTrays";
+let j = class {
   constructor(e, t, r) {
     o(this, "id");
+    o(this, "_carbTankModel");
     o(this, "logger");
     o(this, "assembly");
     o(this, "_remoteTrays");
@@ -197,8 +382,8 @@ let D = class {
   get iceAgitator() {
     return this.assembly.iceAgitator;
   }
-  get carbAgitator() {
-    return this.assembly.carbAgitator;
+  get carbTank() {
+    return this._carbTankModel;
   }
   get cartridgeAgitators() {
     return this.assembly.cartridgeAgitators;
@@ -220,38 +405,45 @@ let D = class {
   }
   // -------------------LIFECYCLE----------------------------
   get supportsRemoteTrays() {
-    return H.isFeatureEnabled(ft);
+    return V.isFeatureEnabled(wt);
   }
   get supportsIce() {
-    return H.isFeatureEnabled(pt);
+    return V.isFeatureEnabled(Ot);
   }
   get supportsCarb() {
-    return H.isFeatureEnabled(yt);
+    return V.isFeatureEnabled($t);
   }
   async init() {
     this.logger.debug(`initializing freestyle-assembly ${this.id}`);
   }
+  async ready() {
+    const e = Ze(
+      this.assembly,
+      Te.type
+    );
+    this._carbTankModel = e;
+  }
 };
-_e([
-  de
-], D.prototype, "_remoteTrays", 2);
-D = _e([
-  ge(),
-  f(ve)
-], D);
-const W = new ee({
-  class: D,
-  type: ve
+Oe([
+  fe
+], j.prototype, "_remoteTrays", 2);
+j = Oe([
+  me(),
+  b($e)
+], j);
+const W = new oe({
+  class: j,
+  type: $e
 });
-var mt = Object.defineProperty, Pt = Object.getOwnPropertyDescriptor, Ie = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Pt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && mt(t, r, a), a;
+var St = Object.defineProperty, Mt = Object.getOwnPropertyDescriptor, we = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Mt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && St(t, r, a), a;
 };
-const Te = "remote-tray-model";
-j("holderPath");
-const bt = j("configPath");
-let z = class {
+const Se = "remote-tray-model";
+R("holderPath");
+const Dt = R("configPath");
+let B = class {
   constructor(e, t, r) {
     /** Unique identifier for the remote tray instance */
     o(this, "id");
@@ -341,65 +533,65 @@ let z = class {
     this.logger.debug(`loading remote-tray ${this.id}`);
   }
 };
-Ie([
-  p({
-    path: bt,
+we([
+  y({
+    path: Dt,
     attribute: "enabled"
   })
-], z.prototype, "remoteTrayEnabled", 2);
-z = Ie([
-  f(Te)
-], z);
-const A = new b({
-  class: z,
-  type: Te
+], B.prototype, "remoteTrayEnabled", 2);
+B = we([
+  b(Se)
+], B);
+const w = new _({
+  class: B,
+  type: Se
 });
-var _t = Object.getOwnPropertyDescriptor, vt = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? _t(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = n(a) || a);
+var Rt = Object.getOwnPropertyDescriptor, Nt = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Rt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = n(a) || a);
   return a;
 };
-const Oe = "remote-tray-container-model";
-let Z = class {
+const Me = "remote-tray-container-model";
+let Q = class {
   constructor(e) {
     o(this, "id");
     this.id = e;
   }
 };
-Z = vt([
-  f(Oe),
-  ce(),
-  Ue()
-], Z);
-const re = new ee({
-  class: Z,
-  type: Oe
+Q = Nt([
+  b(Me),
+  re(),
+  We()
+], Q);
+const ne = new oe({
+  class: Q,
+  type: Me
 });
-re.addRelatedModel(A);
-var It = Object.getOwnPropertyDescriptor, Tt = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? It(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = n(a) || a);
+ne.addRelatedModel(w);
+var zt = Object.getOwnPropertyDescriptor, Lt = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? zt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = n(a) || a);
   return a;
 };
-const Ae = "freestyle-holder-model";
-function Ot(e) {
-  const t = Be.getContext(e), r = t == null ? void 0 : t.get(
+const De = "freestyle-holder-model";
+function Ft(e) {
+  const t = Qe.getContext(e), r = t == null ? void 0 : t.get(
     W.type
   );
   if (!r) {
-    $.error("Freestyle assembly not found");
+    C.error("Freestyle assembly not found");
     return;
   }
   return r;
 }
-async function At(e, t) {
+async function Gt(e, t) {
   if (!e || !t)
     return;
   const r = await e[t]();
   if (r != null && r.tracker)
-    return xe.getFuture(r.tracker);
+    return Xe.getFuture(r.tracker);
 }
-let Q = class {
+let X = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -415,20 +607,20 @@ let Q = class {
     if (!this.holder.data.agitated)
       return;
     this.future = void 0;
-    const e = Ot(this.id);
+    const e = Ft(this.id);
     if (!e)
       return;
     if (!e.defaultCartridgeAgitator) {
       this.logger.error("Agitator not found");
       return;
     }
-    return this.future = await At(
+    return this.future = await Gt(
       e.defaultCartridgeAgitator,
       "testAgitate"
     ), this.future;
   }
   get isRemote() {
-    const e = `${A.type}-${this.holder.path}`, t = v(e);
+    const e = `${w.type}-${this.holder.path}`, t = v(e);
     return t != null && t.model ? !!t.model.remoteTrayEnabled.value : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -439,51 +631,51 @@ let Q = class {
     this.logger.debug(`loading freestyle-holder ${this.id}`);
   }
 };
-Q = Tt([
-  f(Ae)
-], Q);
-const se = new b({
-  class: Q,
-  type: Ae
-}), { URL: Et } = F("FREESTYLE-NOZZLE_SERVICE"), { getOne: $t } = G.build({
-  basePath: `${Et}/api/freestyle-nozzle`
-}), C = $.createLogger({
+X = Lt([
+  b(De)
+], X);
+const ce = new _({
+  class: X,
+  type: De
+}), { URL: Ut } = M("FREESTYLE-NOZZLE_SERVICE"), { getOne: jt } = D.build({
+  basePath: `${Ut}/api/freestyle-nozzle`
+}), z = C.createLogger({
   name: "freestyle-nozzle-service",
   group: "Services"
 });
-class Ct extends Error {
+class Bt extends Error {
   constructor(t) {
     super(t), this.name = "NutritionInfoError";
   }
 }
-class ie extends Error {
+class ue extends Error {
   constructor(t) {
     super(t), this.name = "InvalidRequestError";
   }
 }
-const wt = async (e, t, r, s = "http://localhost:8081") => {
-  if (C.debug("sending GET for freestyle-nozzle"), !t)
-    throw C.error("Invalid freestyle-nozzle request: beverageId is required"), new ie("No beverageId provided");
+const Kt = async (e, t, r, i = "http://localhost:8081") => {
+  if (z.debug("sending GET for freestyle-nozzle"), !t)
+    throw z.error("Invalid freestyle-nozzle request: beverageId is required"), new ue("No beverageId provided");
   if (!r || r.length === 0)
-    throw C.error("Invalid freestyle-nozzle request: volumes are required"), new ie("No volumes provided");
-  const a = await $t({
-    urlOverride: `${s}${e}/pipeline/beverage/engine/nutrition/${t}?volumes=${r.join(
+    throw z.error("Invalid freestyle-nozzle request: volumes are required"), new ue("No volumes provided");
+  const a = await jt({
+    urlOverride: `${i}${e}/pipeline/beverage/engine/nutrition/${t}?volumes=${r.join(
       ","
     )}`
   });
   if (!(a != null && a.data))
-    throw C.error("Failed to retrieve freestyle-nozzle data"), new Error("Failed to retrieve freestyle-nozzle data");
+    throw z.error("Failed to retrieve freestyle-nozzle data"), new Error("Failed to retrieve freestyle-nozzle data");
   if (a.data.error)
-    throw new Ct(a.data.error);
+    throw new Bt(a.data.error);
   return a.data;
 };
-var Mt = Object.defineProperty, St = Object.getOwnPropertyDescriptor, Ee = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? St(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && Mt(t, r, a), a;
+var kt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, Re = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? xt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && kt(t, r, a), a;
 };
-const $e = "freestyle-nozzle-model";
-let N = class {
+const Ne = "freestyle-nozzle-model";
+let K = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -508,12 +700,12 @@ let N = class {
       );
       const e = this.nozzleModel.selectedPourable.beverage.rawId, t = this.nozzleModel.urlPrefix;
       try {
-        const r = await wt(
+        const r = await Kt(
           t,
           e,
           this._cupSizes
         );
-        w(() => {
+        L(() => {
           this._nutritionInfo = r;
         });
       } catch (r) {
@@ -532,54 +724,54 @@ let N = class {
     this.logger.debug(`loading freestyle-nozzle ${this.id}`);
   }
 };
-Ee([
-  k({
+Re([
+  ae({
     dependencies: (e) => [
       e.selectedPourable.beverage
     ]
   })
-], N.prototype, "handleBeverageSelection", 1);
-N = Ee([
-  ge(),
-  f($e)
-], N);
-const ne = new b({
-  class: N,
-  type: $e
-}), { URL: Ce } = F("PUMP_SERVICE"), { postModel: Rt } = G.build({
-  basePath: `${Ce}/api/ext/freestyle/microCalibration`
-}), q = $.createLogger({
+], K.prototype, "handleBeverageSelection", 1);
+K = Re([
+  me(),
+  b(Ne)
+], K);
+const ge = new _({
+  class: K,
+  type: Ne
+}), { URL: ze } = M("PUMP_SERVICE"), { postModel: Ht } = D.build({
+  basePath: `${ze}/api/ext/freestyle/microCalibration`
+}), Z = C.createLogger({
   name: "freestyle-pump-service",
   group: "Services"
-}), Dt = async (e, t) => {
-  var r, s, a, i, n;
-  q.debug(
+}), Vt = async (e, t) => {
+  var r, i, a, s, n;
+  Z.debug(
     `replacePump - sending POST request to /api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
   );
   try {
-    const l = await Rt({
+    const l = await Ht({
       model: {},
-      urlOverride: `${Ce}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
+      urlOverride: `${ze}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
     });
-    return q.debug("replacePump - response:", l), ((l == null ? void 0 : l.status) === 200 || (l == null ? void 0 : l.status) === 499) && ((r = l.data) != null && r.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
+    return Z.debug("replacePump - response:", l), ((l == null ? void 0 : l.status) === 200 || (l == null ? void 0 : l.status) === 499) && ((r = l.data) != null && r.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
   } catch (l) {
-    if (q.error(
+    if (Z.error(
       `replacePump - sending POST request to /api/cal/${e}/code/${t}`,
       l
-    ), l instanceof He) {
-      const O = ((a = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : a.error) || ((i = l.payload) == null ? void 0 : i.error) || "unknownError";
-      return [O, ((n = l.payload) == null ? void 0 : n.data) || { error: O }];
+    ), l instanceof Je) {
+      const $ = ((a = (i = l.payload) == null ? void 0 : i.data) == null ? void 0 : a.error) || ((s = l.payload) == null ? void 0 : s.error) || "unknownError";
+      return [$, ((n = l.payload) == null ? void 0 : n.data) || { error: $ }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
 };
-var zt = Object.getOwnPropertyDescriptor, Nt = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? zt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = n(a) || a);
+var Yt = Object.getOwnPropertyDescriptor, qt = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Yt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = n(a) || a);
   return a;
 };
-const we = "freestyle-pump-model";
-let X = class {
+const Le = "freestyle-pump-model";
+let J = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -588,65 +780,65 @@ let X = class {
   }
   // -------------------LIFECYCLE----------------------------
   async replacePump(e) {
-    const [t, r] = await Dt(this.pump.path, e);
+    const [t, r] = await Vt(this.pump.path, e);
     return t && this.logger.error(`Failed to replace the pump, ${this.pump.id}`, t), [t, r];
   }
 };
-X = Nt([
-  f(we)
-], X);
-const le = new b({
-  class: X,
-  type: we
-}), { URL: I } = F("ICE_AGITATOR_SERVICE"), { getAll: Me, postModel: x } = G.build({
-  basePath: `${I}/api/ext/freestyle/ice`
-}), Se = $.createLogger({
+J = qt([
+  b(Le)
+], J);
+const he = new _({
+  class: J,
+  type: Le
+}), { URL: E } = M("ICE_AGITATOR_SERVICE"), { getAll: Fe, postModel: H } = D.build({
+  basePath: `${E}/api/ext/freestyle/ice`
+}), Ge = C.createLogger({
   name: "ice-agitator-service",
   group: "Services"
-}), Lt = async (e) => (Se.debug("sending GET for ice types"), await Me({
-  urlOverride: `${I}/api/handle/${e}/types`
-})), Ft = async (e, t) => (Se.debug("sending POST for ice types"), await x({
-  urlOverride: `${I}/api/handle/${e}/type/${t}`,
+}), Zt = async (e) => (Ge.debug("sending GET for ice types"), await Fe({
+  urlOverride: `${E}/api/handle/${e}/types`
+})), Wt = async (e, t) => (Ge.debug("sending POST for ice types"), await H({
+  urlOverride: `${E}/api/handle/${e}/type/${t}`,
   model: {}
-})), Gt = async (e) => await Me({
-  urlOverride: `${I}/api/kos/config/details/${e}/4`
-}), jt = async (e, t) => {
-  const r = await x({
+})), Qt = async (e) => await Fe({
+  urlOverride: `${E}/api/kos/config/details/${e}/4`
+}), Xt = async (e, t) => {
+  const r = await H({
     model: {},
     tracker: t,
-    urlOverride: `${I}/api/handle/${e}/pour`
+    urlOverride: `${E}/api/handle/${e}/pour`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, Ut = async (e, t) => {
-  const r = await x({
+}, Jt = async (e, t) => {
+  const r = await H({
     model: {},
     tracker: t,
-    urlOverride: `${I}/api/handle/${e}/test/agitation`
+    urlOverride: `${E}/api/handle/${e}/test/agitation`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, Bt = async (e, t) => {
-  const r = await x({
+}, er = async (e, t) => {
+  const r = await H({
     model: {},
     tracker: t,
-    urlOverride: `${I}/api/handle/${e}/test/gate`
+    urlOverride: `${E}/api/handle/${e}/test/gate`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 };
-var xt = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, g = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Ht(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && xt(t, r, a), a;
+var tr = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, u = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && tr(t, r, a), a;
 };
-class L {
+class k {
 }
-o(L, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), o(L, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
-const Re = "ice-agitator-model", De = j("statePath");
+o(k, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), o(k, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
+const Ue = "ice-agitator-model", je = R("statePath");
 let d = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -668,7 +860,7 @@ let d = class {
     o(this, "_allIceTypes");
     o(this, "logger");
     o(this, "currentState", c.IDLE);
-    o(this, "resetDefaultValues", async () => await Gt(this.path));
+    o(this, "resetDefaultValues", async () => await Qt(this.path));
     this.id = e, this.name = t.name, this.path = t.path, this.statePath = t.statePath, this._allIceTypes = [], this.logger = r.logger;
   }
   get iceTypes() {
@@ -699,7 +891,7 @@ let d = class {
     return this.currentState === c.IDLE;
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && w(() => {
+    this.currentState === e && L(() => {
       this.currentState = t;
     });
   }
@@ -708,7 +900,7 @@ let d = class {
       if (this.currentState === c.IDLE) {
         if (this.updateIfCurrent(c.IDLE, c.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const t = await jt(this.path, e);
+        const t = await Xt(this.path, e);
         return this.updateIfCurrent(c.POUR_STARTING, c.POURING), t != null && t.endState && this.updateIfCurrent(c.POURING, c.IDLE), t;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
@@ -721,7 +913,7 @@ let d = class {
    * */
   async cancelIceDispense() {
     var e;
-    this.currentState === c.POURING || this.currentState === c.POUR_STARTING ? (this.currentState = c.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), w(() => {
+    this.currentState === c.POURING || this.currentState === c.POUR_STARTING ? (this.currentState = c.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), L(() => {
       this.currentState = c.IDLE;
     })) : this.logger.warn(
       `Cannot cancel ice dispense in state ${this.currentState}`
@@ -730,142 +922,142 @@ let d = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating ice-agitator ${this.id}`), Ut(this.path, e);
+    return this.logger.info(`agitating ice-agitator ${this.id}`), Jt(this.path, e);
   }
   async testGate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`testing ice gate:  ${this.id}`), Bt(this.path, e);
+    return this.logger.info(`testing ice gate:  ${this.id}`), er(this.path, e);
   }
   handleAgitationChange() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), M.publish(L.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), F.publish(k.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-    })) : M.publish(L.TOPIC_AGITATION_ENDED, {
+    })) : F.publish(k.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
   async updateIceType(e) {
-    await Ft(this.path, e);
+    await Wt(this.path, e);
   }
   async init() {
     this.logger.debug(`initializing ice-agitator ${this.id}`);
   }
   async load() {
     this.logger.debug(`loading ice-agitator ${this.id}`);
-    const e = await Lt(this.path);
-    (e == null ? void 0 : e.status) === 200 && w(() => {
+    const e = await Zt(this.path);
+    (e == null ? void 0 : e.status) === 200 && L(() => {
       this._allIceTypes = e.data || [];
     });
   }
 };
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "settings.volWithoutIceMl"
   })
 ], d.prototype, "volWithoutIceMl", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "settings.durationSec",
     converter: {
       to: "second"
     }
   })
 ], d.prototype, "durationSec", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "enableIceChuteClear"
   })
 ], d.prototype, "enableIceChuteClear", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "iceChuteClearDurationMs"
   })
 ], d.prototype, "iceChuteClearDurationMs", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "iceChuteClearIntervalSec"
   })
 ], d.prototype, "iceChuteClearIntervalSec", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "iceChuteClearRetryIntervalSec"
   })
 ], d.prototype, "iceChuteClearRetryIntervalSec", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "maxDispenseSec"
   })
 ], d.prototype, "maxDispenseSec", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "type"
   })
 ], d.prototype, "type", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "settings.dilutionOffset"
   })
 ], d.prototype, "dilutionOffset", 2);
-g([
-  p({
-    path: m,
+u([
+  y({
+    path: I,
     attribute: "settings.inactivitySec",
     converter: {
       to: "minute"
     }
   })
 ], d.prototype, "inactivitySec", 2);
-g([
-  J({ path: De, attribute: "agitating" })
+u([
+  O({ path: je, attribute: "agitating" })
 ], d.prototype, "agitating", 2);
-g([
-  J({ path: De, attribute: "iceChuteOpen" })
+u([
+  O({ path: je, attribute: "iceChuteOpen" })
 ], d.prototype, "iceChuteOpen", 2);
-g([
-  U({ alias: "pour" })
+u([
+  N({ alias: "pour" })
 ], d.prototype, "pourIce", 1);
-g([
-  U({ alias: "agitate" })
+u([
+  N({ alias: "agitate" })
 ], d.prototype, "testAgitate", 1);
-g([
-  U({
+u([
+  N({
     alias: "gate"
   })
 ], d.prototype, "testGate", 1);
-g([
-  k({
+u([
+  ae({
     dependencies: (e) => [e.isAgitating]
   })
 ], d.prototype, "handleAgitationChange", 1);
-d = g([
-  f(Re),
-  Ke()
+d = u([
+  b(Ue),
+  et()
 ], d);
-const ze = new b({
+const Be = new _({
   class: d,
-  type: Re
+  type: Ue
 });
-var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, ae = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Yt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && Kt(t, r, a), a;
+var ar = Object.defineProperty, or = Object.getOwnPropertyDescriptor, le = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? or(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && ar(t, r, a), a;
 };
-const oe = "agitation-required-trouble-model", qt = (e) => {
+const de = "agitation-required-trouble-model", ir = (e) => {
   if (e.data.agitationRequired)
-    return oe;
-}, Vt = "InsufficientAgitationTrouble";
-let E = class {
+    return de;
+}, sr = "InsufficientAgitationTrouble";
+let S = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -890,10 +1082,10 @@ let E = class {
     }
   }
   get shouldDefer() {
-    var s, a;
+    var i, a;
     if (!this.holder)
       return !0;
-    const t = (((s = this.holder) == null ? void 0 : s.troublesByType[Vt]) || []).length > 0;
+    const t = (((i = this.holder) == null ? void 0 : i.troublesByType[sr]) || []).length > 0;
     return !!((a = this.agitateBeforePour) != null && a.value) && t;
   }
   get deferred() {
@@ -906,81 +1098,80 @@ let E = class {
     this._deferred = !1;
   }
 };
-ae([
-  p({
+le([
+  y({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.agitateBeforePour"
   })
-], E.prototype, "agitateBeforePour", 2);
-ae([
-  Ye({
-    topic: Ve(ue.type),
-    lifecycle: qe.INIT
+], S.prototype, "agitateBeforePour", 2);
+le([
+  tt({
+    topic: rt(be.type),
+    lifecycle: ye.INIT
   })
-], E.prototype, "updateHolder", 1);
-E = ae([
-  f(oe)
-], E);
-const Wt = new b({
-  class: E,
-  type: oe
-}), Zt = ["iceAgitator", "carbAgitator"], Qt = {
-  iceAgitator: ze.factory,
-  carbAgitator: pe.factory
-}, Xt = $.createLogger({ name: "freestyle-assembly-data-mapper" }), rr = async (e) => {
-  const t = te.instance().options({}).build(), r = re.instance().options({}).build(), s = e.assemblies.reduce((n, l) => {
-    var O;
-    return Zt.forEach((u) => {
-      var _;
-      const P = l[u];
+], S.prototype, "updateHolder", 1);
+S = le([
+  b(de)
+], S);
+const nr = new _({
+  class: S,
+  type: de
+}), lr = ["iceAgitator"], dr = {
+  iceAgitator: Be.factory
+}, cr = C.createLogger({ name: "freestyle-assembly-data-mapper" }), yr = async (e) => {
+  const t = se.instance().options({}).build(), r = ne.instance().options({}).build(), i = e.assemblies.reduce((n, l) => {
+    var $;
+    return lr.forEach((h) => {
+      var T;
+      const P = l[h];
       if (P) {
-        const Ne = Qt[u](P.path);
-        n[u] = Ne({
+        const Ke = dr[h](P.path);
+        n[h] = Ke({
           name: P.name,
           path: P.path,
-          statePath: ((_ = P.state) == null ? void 0 : _.path) || ""
+          statePath: ((T = P.state) == null ? void 0 : T.path) || ""
         });
       }
-    }), (O = l.cartridgeAgitators) == null || O.forEach((u) => {
-      var _;
-      const P = be.instance(
-        u.path
+    }), ($ = l.cartridgeAgitators) == null || $.forEach((h) => {
+      var T;
+      const P = Ce.instance(
+        h.path
       ).options({
-        name: u.name,
-        path: u.path,
-        statePath: ((_ = u.state) == null ? void 0 : _.path) || ""
+        name: h.name,
+        path: h.path,
+        statePath: ((T = h.state) == null ? void 0 : T.path) || ""
       }).build();
       t.addModel(P);
-    }), l.remoteTrays && l.remoteTrays.forEach((u) => {
-      Xt.info(`Found remote tray ${u.name} with path ${u.path}`);
-      const P = `${A.type}-${u.holderPath}`, _ = A.instance(P).options({
-        holderPath: u.holderPath,
-        configPath: u.path,
-        name: u.name
+    }), l.remoteTrays && l.remoteTrays.forEach((h) => {
+      cr.info(`Found remote tray ${h.name} with path ${h.path}`);
+      const P = `${w.type}-${h.holderPath}`, T = w.instance(P).options({
+        holderPath: h.holderPath,
+        configPath: h.path,
+        name: h.name
       }).build();
-      r.addModel(_);
+      r.addModel(T);
     }), n;
-  }, {}), a = !!s.iceAgitator, i = !!s.carbAgitator;
+  }, {}), a = !!i.iceAgitator, s = !!i.carbTank;
   return {
-    ...s,
+    ...i,
     cartridgeAgitators: t,
     remoteTrays: r,
-    supportsCarb: i,
+    supportsCarb: s,
     supportsIce: a
   };
-}, Jt = (e) => () => (We(e)(), Xe(e)(), ne.register(), W.register(), ze.register(), pe.register(), te.register(), le.register(), se.register(), A.register(), re.register(), h.companion.register(e)(
-  Je.type,
-  ne.type
-), h.companion.register(e)(
-  ue.type,
+}, ur = (e) => () => (at(e)(), st(e)(), ge.register(), W.register(), Be.register(), Te.register(), se.register(), he.register(), ce.register(), w.register(), ne.register(), p.companion.register(e)(
+  nt.type,
+  ge.type
+), p.companion.register(e)(
+  be.type,
   W.type
-), Wt.register(), h.companion.register(e)(
-  Ze.type,
-  qt
-), h.companion.register(e)(ke.type, le.type), h.companion.register(e)(
-  et.type,
-  se.type
-), K[Y].register(
+), nr.register(), p.companion.register(e)(
+  ot.type,
+  ir
+), p.companion.register(e)(lt.type, he.type), p.companion.register(e)(
+  dt.type,
+  ce.type
+), Y[q].register(
   "EnjoyByTrouble",
   async (t) => {
     if (t.data.enjoyByDate) {
@@ -993,21 +1184,21 @@ const Wt = new b({
     }
     return {};
   }
-), K[Y].register(
+), Y[q].register(
   "SuperPumpRequiredTrouble",
   // This is the trouble type
   async (t) => {
     const { model: r } = v(
-      tt.type
+      ct.type
     );
     return r ? {
       superPumps: r.models.getIndexByKey(
-        rt.byType,
+        ut.byType,
         "microSuper"
-      ).map((i) => i.name).join(", ")
+      ).map((s) => s.name).join(", ")
     } : {};
   }
-), K[Y].register(
+), Y[q].register(
   "MicroPumpAirDetectTrouble",
   async (t) => {
     if (t.ifaces.includes("container"))
@@ -1017,53 +1208,53 @@ const Wt = new b({
         t.data.pumpPath
       );
       if (r) {
-        const s = r.ingredientId ? v(r.ingredientId).model : void 0;
+        const i = r.ingredientId ? v(r.ingredientId).model : void 0;
         return {
           ingredientId: r.ingredientId,
-          ingredientName: (s == null ? void 0 : s.name) || ""
+          ingredientName: (i == null ? void 0 : i.name) || ""
         };
       }
     }
     return {};
   }
 ), {
-  preload: h.model.preloadModel(e),
-  model: h.model.register(e),
-  companion: h.companion.register(e),
-  legacy: h.model.registerLegacyModel(e)
-}), y = {
-  ...Qe
+  preload: p.model.preloadModel(e),
+  model: p.model.register(e),
+  companion: p.companion.register(e),
+  legacy: p.model.registerLegacyModel(e)
+}), m = {
+  ...it
 };
-y.freestyle = {
-  models: Jt(y)
+m.freestyle = {
+  models: ur(m)
 };
-y.preload = h.model.preloadModel(y);
-y.model = h.model.register(y);
-y.companion = h.companion.register(y);
-y.legacy = h.model.registerLegacyModel(y);
-const ar = y;
+m.preload = p.model.preloadModel(m);
+m.model = p.model.register(m);
+m.companion = p.companion.register(m);
+m.legacy = p.model.registerLegacyModel(m);
+const fr = m;
 export {
-  Vt as A,
-  pe as C,
+  sr as A,
+  Te as C,
   W as F,
-  L as I,
-  ar as K,
-  Ct as N,
-  re as R,
-  te as a,
-  R as b,
-  be as c,
-  se as d,
-  ne as e,
-  le as f,
-  ze as g,
-  Wt as h,
-  A as i,
-  ie as j,
-  wt as k,
-  Dt as l,
-  rr as m,
-  pt as n,
-  Jt as r
+  k as I,
+  fr as K,
+  Bt as N,
+  ne as R,
+  se as a,
+  U as b,
+  Ce as c,
+  ce as d,
+  ge as e,
+  he as f,
+  Be as g,
+  nr as h,
+  w as i,
+  ue as j,
+  Kt as k,
+  Vt as l,
+  yr as m,
+  Ot as n,
+  ur as r
 };
-//# sourceMappingURL=freestyle-registration-manager-z0aYdMcC.js.map
+//# sourceMappingURL=freestyle-registration-manager-CymJYnwk.js.map