@kosdev-code/kos-freestyle-sdk 2.0.40 → 2.1.0

package/{freestyle-registration-manager-CI8el36E.js → freestyle-registration-manager-CClN6mVr.js}

@@ -1,15 +1,15 @@
-var Ne = Object.defineProperty;
-var Fe = (e, t, r) => t in e ? Ne(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 P, KosModelContainer as de, kosChild as X, resolveServiceUrl as L, ServiceFactory as G, createPropKey as j, kosStateProp as J, kosFuture as U, setupMinimalFutureSupport as Le, kosEffect as Ge, EventBus as w, SingletonKosModelRegistrationFactory as k, kosParentAware as ue, KosFeatureFlags as H, kosConfigProperty as p, getKosModelSync as v, KosContextManager as je, KosLog as A, FutureManager as Ue, kosAutoEffect as Be, kosAction as M, FetchError as He, KOS_MODEL_ID as m, kosModelEffect as xe, MultipleFutureHandler as Ke, kosTopicHandler as Ye, modelTypeEventTopicFactory as qe, DependencyLifecycle as Ve, RegistrationManager as h, registerCoreModels as We, Trouble as Ze, ExtensionManager as x, EXTENSION_TROUBLE_DATA_MAPPER as K } from "@kosdev-code/kos-ui-sdk";
+var Fe = Object.defineProperty;
+var Le = (e, t, r) => t in e ? Fe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var o = (e, t, r) => (Le(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { kosModel as f, KosModelRegistrationFactory as b, KosModelContainer as Ge, kosChild as de, resolveServiceUrl as L, ServiceFactory as G, createPropKey as j, kosStateProp as J, kosFuture as U, kosModelEffect as k, kosFutureAware as je, kosLoggerAware as ue, EventBus as M, SingletonKosModelRegistrationFactory as ee, kosParentAware as ce, KosFeatureFlags as x, kosConfigProperty as p, getKosModelSync as v, kosContainerAware as Ue, KosContextManager as Be, KosLog as $, FutureManager as He, kosAction as w, FetchError as xe, KOS_MODEL_ID as m, MultipleFutureHandler 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 u, Assembly as ge, 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.defineProperty, ot = Object.getOwnPropertyDescriptor, st = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? ot(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 && at(t, r, a), a;
+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;
 };
-const ce = "carb-agitator-model";
-let q = class {
+const he = "carb-agitator-model";
+let V = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "name");
@@ -25,25 +25,25 @@ let q = class {
     this.logger.debug(`loading carb-agitator ${this.id}`);
   }
 };
-q = st([
-  f(ce)
-], q);
-const he = new P({
-  class: q,
-  type: ce
+V = ot([
+  f(he)
+], V);
+const pe = new b({
+  class: V,
+  type: he
 });
-var it = Object.defineProperty, nt = Object.getOwnPropertyDescriptor, pe = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? nt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+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 && it(t, r, a), a;
+  return s && a && st(t, r, a), a;
 };
-const ye = "cartridge-agitator-container-model";
+const fe = "cartridge-agitator-container-model";
 let S = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
     o(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new de({
+    this.id = e, this.logger = r.logger, this._models = new Ge({
       parentId: e
     });
   }
@@ -74,45 +74,42 @@ let S = class {
     );
   }
 };
-pe([
-  X
+ye([
+  de
 ], S.prototype, "_models", 2);
-S = pe([
-  f(ye)
+S = ye([
+  f(fe)
 ], S);
-const { URL: fe } = L("CARTRIDGE_AGITATOR_SERVICE"), { postModel: lt } = G.build({
-  basePath: `${fe}/api/ext/freestyle/freestyle/ice`
-}), dt = async (e, t) => {
-  const r = await lt({
+const { URL: me } = L("CARTRIDGE_AGITATOR_SERVICE"), { postModel: nt } = G.build({
+  basePath: `${me}/api/ext/freestyle/freestyle/ice`
+}), lt = async (e, t) => {
+  const r = await nt({
     model: {},
     tracker: t,
-    urlOverride: `${fe}/api/handle/${e}/test`
+    urlOverride: `${me}/api/handle/${e}/test`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
 };
-var ut = Object.defineProperty, gt = Object.getOwnPropertyDescriptor, ee = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? gt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+var dt = Object.defineProperty, ut = Object.getOwnPropertyDescriptor, B = (e, t, r, s) => {
+  for (var a = s > 1 ? void 0 : s ? ut(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;
+  return s && a && dt(t, r, a), a;
 };
-const me = "cartridge-agitator-model";
+const Pe = "cartridge-agitator-model";
 class R {
 }
 o(R, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), o(R, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
 const ct = j("statePath");
-let O = class {
-  constructor(e, t, r) {
+let T = class {
+  constructor(e, t) {
     o(this, "id");
-    o(this, "futureHandler");
-    o(this, "logger");
-    o(this, "disposer");
     o(this, "agitating");
     o(this, "path");
     o(this, "statePath");
     o(this, "name");
-    this.id = e, this.logger = r.logger, this.path = t.path, this.name = t.name, this.statePath = t.statePath, Le(this);
+    this.id = e, this.path = t.path, this.name = t.name, this.statePath = t.statePath;
   }
   get isAgitating() {
     return !!this.agitating.value;
@@ -120,55 +117,48 @@ let O = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating cartridge-agitator ${this.id}`), dt(this.path, e);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing cartridge-agitator ${this.id}`);
+    return this.logger.info(`agitating cartridge-agitator ${this.id}`), lt(this.path, e);
   }
-  unload() {
+  handleAgitation() {
     var e;
-    (e = this.disposer) == null || e.call(this);
-  }
-  async load() {
-    this.logger.debug(`loading cartridge-agitator ${this.id}`), this.disposer = Ge(
-      () => this.isAgitating,
-      () => {
-        var e;
-        this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), w.publish(R.TOPIC_AGITATION_STARTED, {
-          path: this.path,
-          futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-        })) : w.publish(R.TOPIC_AGITATION_ENDED, {
-          path: this.path
-        });
-      },
-      {}
-    );
+    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), M.publish(R.TOPIC_AGITATION_STARTED, {
+      path: this.path,
+      futureId: (e = this.future) == null ? void 0 : e.futureId
+    })) : M.publish(R.TOPIC_AGITATION_ENDED, {
+      path: this.path
+    });
   }
 };
-ee([
+B([
   J({ path: ct, attribute: "agitating" })
-], O.prototype, "agitating", 2);
-ee([
+], T.prototype, "agitating", 2);
+B([
   U()
-], O.prototype, "testAgitate", 1);
-O = ee([
-  f(me)
-], O);
-const _e = new P({
-  class: O,
-  type: me
-}), te = new k({
+], T.prototype, "testAgitate", 1);
+B([
+  k({
+    dependencies: (e) => [e.isAgitating]
+  })
+], T.prototype, "handleAgitation", 1);
+T = B([
+  f(Pe),
+  je(),
+  ue()
+], T);
+const be = new b({
+  class: T,
+  type: Pe
+}), te = new ee({
   class: S,
-  type: ye
+  type: fe
 });
-te.addRelatedModel(_e);
-var ht = Object.defineProperty, pt = Object.getOwnPropertyDescriptor, Pe = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? pt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+te.addRelatedModel(be);
+var gt = 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 && ht(t, r, a), a;
+  return s && a && gt(t, r, a), a;
 };
-const be = "freestyle-assembly-model", yt = "iceAgitator", ft = "carbAgitator", mt = "remoteTrays";
+const ve = "freestyle-assembly-model", pt = "iceAgitator", yt = "carbAgitator", ft = "remoteTrays";
 let D = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -230,35 +220,35 @@ let D = class {
   }
   // -------------------LIFECYCLE----------------------------
   get supportsRemoteTrays() {
-    return H.isFeatureEnabled(mt);
+    return x.isFeatureEnabled(ft);
   }
   get supportsIce() {
-    return H.isFeatureEnabled(yt);
+    return x.isFeatureEnabled(pt);
   }
   get supportsCarb() {
-    return H.isFeatureEnabled(ft);
+    return x.isFeatureEnabled(yt);
   }
   async init() {
     this.logger.debug(`initializing freestyle-assembly ${this.id}`);
   }
 };
-Pe([
-  X
+_e([
+  de
 ], D.prototype, "_remoteTrays", 2);
-D = Pe([
-  ue(),
-  f(be)
+D = _e([
+  ce(),
+  f(ve)
 ], D);
-const V = new k({
+const W = new ee({
   class: D,
-  type: be
+  type: ve
 });
-var _t = Object.defineProperty, Pt = Object.getOwnPropertyDescriptor, ve = (e, t, r, s) => {
+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 && _t(t, r, a), a;
+  return s && a && mt(t, r, a), a;
 };
-const Ie = "remote-tray-model";
+const Te = "remote-tray-model";
 j("holderPath");
 const bt = j("configPath");
 let z = class {
@@ -278,7 +268,7 @@ let z = class {
   /**
    * Gets the troubles from the associated holder model.
    * Propagates trouble states from the holder to this remote tray.
-   * 
+   *
    * @returns Array of trouble models from the holder, or empty array if no holder
    */
   get troubles() {
@@ -288,7 +278,7 @@ let z = class {
   /**
    * Gets the highest priority trouble status.
    * Currently returns empty string as troubles are managed by the holder.
-   * 
+   *
    * @returns Empty string (trouble status handled by holder)
    */
   get troubleStatus() {
@@ -296,7 +286,7 @@ let z = class {
   }
   /**
    * Gets troubles grouped by type from the associated holder.
-   * 
+   *
    * @returns Record of troubles grouped by type from the holder, or empty object if no holder
    */
   get troublesByType() {
@@ -306,7 +296,7 @@ let z = class {
   /**
    * Updates the model with new configuration options.
    * Can be used to modify the holder path, config path, or name after initialization.
-   * 
+   *
    * @param _options - New configuration options for the remote tray
    */
   updateModel(e) {
@@ -314,7 +304,7 @@ let z = class {
   /**
    * Gets the associated holder model for this remote tray.
    * Uses synchronous model lookup to retrieve the holder by path.
-   * 
+   *
    * @returns The HolderModel instance referenced by holderPath, or undefined if not found
    */
   get holder() {
@@ -323,7 +313,7 @@ let z = class {
   /**
    * Determines if the remote tray is currently active.
    * Active state is based on the remoteTrayEnabled configuration property.
-   * 
+   *
    * @returns true if the tray is enabled, false otherwise
    */
   get active() {
@@ -334,7 +324,7 @@ let z = class {
    * Initializes the remote tray model.
    * Called during the model lifecycle initialization phase.
    * Sets up initial state and prepares the model for use.
-   * 
+   *
    * @returns Promise that resolves when initialization is complete
    */
   async init() {
@@ -344,91 +334,60 @@ let z = class {
    * Loads the remote tray configuration and associated data.
    * Called during the model lifecycle load phase.
    * Typically loads configuration settings and establishes holder references.
-   * 
+   *
    * @returns Promise that resolves when loading is complete
    */
   async load() {
     this.logger.debug(`loading remote-tray ${this.id}`);
   }
 };
-ve([
+Ie([
   p({
     path: bt,
     attribute: "enabled"
   })
 ], z.prototype, "remoteTrayEnabled", 2);
-z = ve([
-  f(Ie)
+z = Ie([
+  f(Te)
 ], z);
-const E = new P({
+const A = new b({
   class: z,
-  type: Ie
+  type: Te
 });
-var vt = Object.defineProperty, It = Object.getOwnPropertyDescriptor, Te = (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 && vt(t, r, a), a;
+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);
+  return a;
 };
 const Oe = "remote-tray-container-model";
-let N = class {
-  constructor(e, t, r) {
+let Z = class {
+  constructor(e) {
     o(this, "id");
-    o(this, "logger");
-    o(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new de({
-      parentId: e
-    });
-  }
-  getModel(e) {
-    return this._models.getModel(e);
-  }
-  get models() {
-    return this._models;
-  }
-  get data() {
-    return this._models.data;
-  }
-  updateModel(e) {
-  }
-  addModel(e) {
-    this._models.addModel(e);
-  }
-  removeModel(e) {
-    this._models.removeModel(e);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(
-      `initializing remote-tray-container container ${this.id}`
-    );
-  }
-  async load() {
-    this.logger.debug(`loading remote-tray-container container ${this.id}`);
+    this.id = e;
   }
 };
-Te([
-  X
-], N.prototype, "_models", 2);
-N = Te([
-  f(Oe)
-], N);
-const re = new k({
-  class: N,
+Z = vt([
+  f(Oe),
+  ue(),
+  Ue()
+], Z);
+const re = new ee({
+  class: Z,
   type: Oe
 });
-re.addRelatedModel(E);
-var Tt = Object.defineProperty, Ot = Object.getOwnPropertyDescriptor, Et = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Ot(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 && Tt(t, r, a), a;
+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);
+  return a;
 };
-const Ee = "freestyle-holder-model";
-function $t(e) {
-  const t = je.getContext(e), r = t == null ? void 0 : t.get(
-    V.type
+const Ae = "freestyle-holder-model";
+function Ot(e) {
+  const t = Be.getContext(e), r = t == null ? void 0 : t.get(
+    W.type
   );
   if (!r) {
-    A.error("Freestyle assembly not found");
+    $.error("Freestyle assembly not found");
     return;
   }
   return r;
@@ -438,9 +397,9 @@ async function At(e, t) {
     return;
   const r = await e[t]();
   if (r != null && r.tracker)
-    return Ue.getFuture(r.tracker);
+    return He.getFuture(r.tracker);
 }
-let W = class {
+let Q = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -456,7 +415,7 @@ let W = class {
     if (!this.holder.data.agitated)
       return;
     this.future = void 0;
-    const e = $t(this.id);
+    const e = Ot(this.id);
     if (!e)
       return;
     if (!e.defaultCartridgeAgitator) {
@@ -469,7 +428,7 @@ let W = class {
     ), this.future;
   }
   get isRemote() {
-    const e = `${E.type}-${this.holder.path}`, t = v(e);
+    const e = `${A.type}-${this.holder.path}`, t = v(e);
     return t != null && t.model ? !!t.model.remoteTrayEnabled.value : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -480,19 +439,19 @@ let W = class {
     this.logger.debug(`loading freestyle-holder ${this.id}`);
   }
 };
-W = Et([
-  f(Ee)
-], W);
-const se = new P({
-  class: W,
-  type: Ee
-}), { URL: Ct } = L("FREESTYLE-NOZZLE_SERVICE"), { getOne: Mt } = G.build({
-  basePath: `${Ct}/api/freestyle-nozzle`
-}), C = A.createLogger({
+Q = Tt([
+  f(Ae)
+], Q);
+const se = new b({
+  class: Q,
+  type: Ae
+}), { URL: Et } = L("FREESTYLE-NOZZLE_SERVICE"), { getOne: $t } = G.build({
+  basePath: `${Et}/api/freestyle-nozzle`
+}), C = $.createLogger({
   name: "freestyle-nozzle-service",
   group: "Services"
 });
-class wt extends Error {
+class Ct extends Error {
   constructor(t) {
     super(t), this.name = "NutritionInfoError";
   }
@@ -502,12 +461,12 @@ class ie extends Error {
     super(t), this.name = "InvalidRequestError";
   }
 }
-const St = async (e, t, r, s = "http://localhost:8081") => {
+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");
   if (!r || r.length === 0)
     throw C.error("Invalid freestyle-nozzle request: volumes are required"), new ie("No volumes provided");
-  const a = await Mt({
+  const a = await $t({
     urlOverride: `${s}${e}/pipeline/beverage/engine/nutrition/${t}?volumes=${r.join(
       ","
     )}`
@@ -515,23 +474,22 @@ const St = async (e, t, r, s = "http://localhost:8081") => {
   if (!(a != null && a.data))
     throw C.error("Failed to retrieve freestyle-nozzle data"), new Error("Failed to retrieve freestyle-nozzle data");
   if (a.data.error)
-    throw new wt(a.data.error);
+    throw new Ct(a.data.error);
   return a.data;
 };
-var Rt = Object.defineProperty, Dt = Object.getOwnPropertyDescriptor, zt = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Dt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+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 && Rt(t, r, a), a;
+  return s && a && Mt(t, r, a), a;
 };
 const $e = "freestyle-nozzle-model";
-let Z = class {
+let N = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
     o(this, "nozzleModel");
     o(this, "_cupSizes");
     o(this, "_nutritionInfo");
-    o(this, "_disposer", null);
     this.id = e, this.logger = r.logger, this.nozzleModel = t.companionParent, this._cupSizes = [100];
   }
   set cupSizes(e) {
@@ -540,77 +498,88 @@ let Z = class {
   get nutritionInfo() {
     return this._nutritionInfo;
   }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing freestyle-nozzle ${this.id}`), this._disposer = Be(async () => {
-      if (this.nozzleModel.selectedPourable.beverage && this._cupSizes.length) {
-        this.logger.debug(
-          `selected beverage: ${this.nozzleModel.selectedPourable.beverage.rawId}.  Volume: ${this._cupSizes.join(", ")}`
+  get selectedPourable() {
+    return this.nozzleModel.selectedPourable;
+  }
+  async handleBeverageSelection() {
+    if (this.nozzleModel.selectedPourable.beverage && this._cupSizes.length) {
+      this.logger.debug(
+        `selected beverage: ${this.nozzleModel.selectedPourable.beverage.rawId}.  Volume: ${this._cupSizes.join(", ")}`
+      );
+      const e = this.nozzleModel.selectedPourable.beverage.rawId, t = this.nozzleModel.urlPrefix;
+      try {
+        const r = await wt(
+          t,
+          e,
+          this._cupSizes
         );
-        const e = this.nozzleModel.selectedPourable.beverage.rawId, t = this.nozzleModel.urlPrefix;
-        try {
-          const r = await St(
-            t,
-            e,
-            this._cupSizes
-          );
-          M(() => {
-            this._nutritionInfo = r;
-          });
-        } catch (r) {
-          this.logger.error(`Error fetching nutrition info: ${r}`);
-        }
+        w(() => {
+          this._nutritionInfo = r;
+        });
+      } catch (r) {
+        this.logger.error(`Error fetching nutrition info: ${r}`);
       }
-    });
+    }
+  }
+  // -------------------LIFECYCLE----------------------------
+  async init() {
+    this.logger.debug(`initializing freestyle-nozzle ${this.id}`);
   }
   unload() {
-    this.logger.debug(`unloading freestyle-nozzle ${this.id}`), this._disposer && this._disposer();
+    this.logger.debug(`unloading freestyle-nozzle ${this.id}`);
   }
   async load() {
     this.logger.debug(`loading freestyle-nozzle ${this.id}`);
   }
 };
-Z = zt([
-  ue(),
+Ee([
+  k({
+    dependencies: (e) => [
+      e.selectedPourable.beverage
+    ]
+  })
+], N.prototype, "handleBeverageSelection", 1);
+N = Ee([
+  ce(),
   f($e)
-], Z);
-const ne = new P({
-  class: Z,
+], N);
+const ne = new b({
+  class: N,
   type: $e
-}), { URL: Ae } = L("PUMP_SERVICE"), { postModel: Nt } = G.build({
-  basePath: `${Ae}/api/ext/freestyle/microCalibration`
-}), Y = A.createLogger({
+}), { URL: Ce } = L("PUMP_SERVICE"), { postModel: Rt } = G.build({
+  basePath: `${Ce}/api/ext/freestyle/microCalibration`
+}), q = $.createLogger({
   name: "freestyle-pump-service",
   group: "Services"
-}), Ft = async (e, t) => {
+}), Dt = async (e, t) => {
   var r, s, a, i, n;
-  Y.debug(
+  q.debug(
     `replacePump - sending POST request to /api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
   );
   try {
-    const l = await Nt({
+    const l = await Rt({
       model: {},
-      urlOverride: `${Ae}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
+      urlOverride: `${Ce}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
     });
-    return Y.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 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];
   } catch (l) {
-    if (Y.error(
+    if (q.error(
       `replacePump - sending POST request to /api/cal/${e}/code/${t}`,
       l
-    ), l instanceof He) {
-      const T = ((a = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : a.error) || ((i = l.payload) == null ? void 0 : i.error) || "unknownError";
-      return [T, ((n = l.payload) == null ? void 0 : n.data) || { error: T }];
+    ), l instanceof xe) {
+      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 }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
 };
-var Lt = Object.defineProperty, Gt = Object.getOwnPropertyDescriptor, jt = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Gt(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 && Lt(t, r, a), a;
+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);
+  return a;
 };
-const Ce = "freestyle-pump-model";
-let Q = class {
+const we = "freestyle-pump-model";
+let X = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -619,30 +588,30 @@ let Q = class {
   }
   // -------------------LIFECYCLE----------------------------
   async replacePump(e) {
-    const [t, r] = await Ft(this.pump.path, e);
+    const [t, r] = await Dt(this.pump.path, e);
     return t && this.logger.error(`Failed to replace the pump, ${this.pump.id}`, t), [t, r];
   }
 };
-Q = jt([
-  f(Ce)
-], Q);
-const le = new P({
-  class: Q,
-  type: Ce
-}), { URL: I } = L("ICE_AGITATOR_SERVICE"), { getAll: Me, postModel: B } = G.build({
+X = Nt([
+  f(we)
+], X);
+const le = new b({
+  class: X,
+  type: we
+}), { URL: I } = L("ICE_AGITATOR_SERVICE"), { getAll: Me, postModel: H } = G.build({
   basePath: `${I}/api/ext/freestyle/ice`
-}), we = A.createLogger({
+}), Se = $.createLogger({
   name: "ice-agitator-service",
   group: "Services"
-}), Ut = async (e) => (we.debug("sending GET for ice types"), await Me({
+}), Ft = async (e) => (Se.debug("sending GET for ice types"), await Me({
   urlOverride: `${I}/api/handle/${e}/types`
-})), Bt = async (e, t) => (we.debug("sending POST for ice types"), await B({
+})), Lt = async (e, t) => (Se.debug("sending POST for ice types"), await H({
   urlOverride: `${I}/api/handle/${e}/type/${t}`,
   model: {}
-})), Ht = async (e) => await Me({
+})), Gt = async (e) => await Me({
   urlOverride: `${I}/api/kos/config/details/${e}/4`
-}), xt = async (e, t) => {
-  const r = await B({
+}), jt = async (e, t) => {
+  const r = await H({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/pour`
@@ -650,8 +619,8 @@ const le = new P({
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, Kt = async (e, t) => {
-  const r = await B({
+}, Ut = async (e, t) => {
+  const r = await H({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/test/agitation`
@@ -659,8 +628,8 @@ const le = new P({
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, Yt = async (e, t) => {
-  const r = await B({
+}, Bt = async (e, t) => {
+  const r = await H({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/test/gate`
@@ -669,15 +638,15 @@ const le = new P({
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 };
-var qt = Object.defineProperty, Vt = Object.getOwnPropertyDescriptor, g = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Vt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+var Ht = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, c = (e, t, r, s) => {
+  for (var a = s > 1 ? void 0 : s ? xt(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 && qt(t, r, a), a;
+  return s && a && Ht(t, r, a), a;
 };
 class F {
 }
 o(F, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), o(F, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
-const Se = "ice-agitator-model", Re = j("statePath");
+const Re = "ice-agitator-model", De = j("statePath");
 let d = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -700,7 +669,7 @@ let d = class {
     o(this, "_allIceTypes");
     o(this, "logger");
     o(this, "currentState", u.IDLE);
-    o(this, "resetDefaultValues", async () => await Ht(this.path));
+    o(this, "resetDefaultValues", async () => await Gt(this.path));
     this.id = e, this.name = t.name, this.path = t.path, this.statePath = t.statePath, this._allIceTypes = [], this.logger = r.logger, this.futureHandler = new Ke(this);
   }
   get iceTypes() {
@@ -742,7 +711,7 @@ let d = class {
     return this.currentState === u.IDLE;
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && M(() => {
+    this.currentState === e && w(() => {
       this.currentState = t;
     });
   }
@@ -751,7 +720,7 @@ let d = class {
       if (this.currentState === u.IDLE) {
         if (this.updateIfCurrent(u.IDLE, u.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const t = await xt(this.path, e);
+        const t = await jt(this.path, e);
         return this.updateIfCurrent(u.POUR_STARTING, u.POURING), t != null && t.endState && this.updateIfCurrent(u.POURING, u.IDLE), t;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
@@ -764,7 +733,7 @@ let d = class {
    * */
   async cancelIceDispense() {
     var e;
-    this.currentState === u.POURING || this.currentState === u.POUR_STARTING ? (this.currentState = u.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), M(() => {
+    this.currentState === u.POURING || this.currentState === u.POUR_STARTING ? (this.currentState = u.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), w(() => {
       this.currentState = u.IDLE;
     })) : this.logger.warn(
       `Cannot cancel ice dispense in state ${this.currentState}`
@@ -773,43 +742,43 @@ let d = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating ice-agitator ${this.id}`), Kt(this.path, e);
+    return this.logger.info(`agitating ice-agitator ${this.id}`), Ut(this.path, e);
   }
   async testGate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`testing ice gate:  ${this.id}`), Yt(this.path, e);
+    return this.logger.info(`testing ice gate:  ${this.id}`), Bt(this.path, e);
   }
   handleAgitationChange() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), w.publish(F.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), M.publish(F.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-    })) : w.publish(F.TOPIC_AGITATION_ENDED, {
+    })) : M.publish(F.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
   async updateIceType(e) {
-    await Bt(this.path, e);
+    await Lt(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 Ut(this.path);
-    (e == null ? void 0 : e.status) === 200 && M(() => {
+    const e = await Ft(this.path);
+    (e == null ? void 0 : e.status) === 200 && w(() => {
       this._allIceTypes = e.data || [];
     });
   }
 };
-g([
+c([
   p({
     path: m,
     attribute: "settings.volWithoutIceMl"
   })
 ], d.prototype, "volWithoutIceMl", 2);
-g([
+c([
   p({
     path: m,
     attribute: "settings.durationSec",
@@ -818,49 +787,49 @@ g([
     }
   })
 ], d.prototype, "durationSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "enableIceChuteClear"
   })
 ], d.prototype, "enableIceChuteClear", 2);
-g([
+c([
   p({
     path: m,
     attribute: "iceChuteClearDurationMs"
   })
 ], d.prototype, "iceChuteClearDurationMs", 2);
-g([
+c([
   p({
     path: m,
     attribute: "iceChuteClearIntervalSec"
   })
 ], d.prototype, "iceChuteClearIntervalSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "iceChuteClearRetryIntervalSec"
   })
 ], d.prototype, "iceChuteClearRetryIntervalSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "maxDispenseSec"
   })
 ], d.prototype, "maxDispenseSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "type"
   })
 ], d.prototype, "type", 2);
-g([
+c([
   p({
     path: m,
     attribute: "settings.dilutionOffset"
   })
 ], d.prototype, "dilutionOffset", 2);
-g([
+c([
   p({
     path: m,
     attribute: "settings.inactivitySec",
@@ -869,45 +838,45 @@ g([
     }
   })
 ], d.prototype, "inactivitySec", 2);
-g([
-  J({ path: Re, attribute: "agitating" })
+c([
+  J({ path: De, attribute: "agitating" })
 ], d.prototype, "agitating", 2);
-g([
-  J({ path: Re, attribute: "iceChuteOpen" })
+c([
+  J({ path: De, attribute: "iceChuteOpen" })
 ], d.prototype, "iceChuteOpen", 2);
-g([
+c([
   U({ alias: "pour" })
 ], d.prototype, "pourIce", 1);
-g([
+c([
   U({ alias: "agitate" })
 ], d.prototype, "testAgitate", 1);
-g([
+c([
   U({
     alias: "gate"
   })
 ], d.prototype, "testGate", 1);
-g([
-  xe({
+c([
+  k({
     dependencies: (e) => [e.isAgitating]
   })
 ], d.prototype, "handleAgitationChange", 1);
-d = g([
-  f(Se)
+d = c([
+  f(Re)
 ], d);
-const De = new P({
+const ze = new b({
   class: d,
-  type: Se
+  type: Re
 });
-var Wt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, ae = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? Zt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+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 && Wt(t, r, a), a;
+  return s && a && Kt(t, r, a), a;
 };
-const oe = "agitation-required-trouble-model", Qt = (e) => {
+const oe = "agitation-required-trouble-model", qt = (e) => {
   if (e.data.agitationRequired)
     return oe;
-}, Xt = "InsufficientAgitationTrouble";
-let $ = class {
+}, Vt = "InsufficientAgitationTrouble";
+let E = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -935,7 +904,7 @@ let $ = class {
     var s, a;
     if (!this.holder)
       return !0;
-    const t = (((s = this.holder) == null ? void 0 : s.troublesByType[Xt]) || []).length > 0;
+    const t = (((s = this.holder) == null ? void 0 : s.troublesByType[Vt]) || []).length > 0;
     return !!((a = this.agitateBeforePour) != null && a.value) && t;
   }
   get deferred() {
@@ -953,54 +922,54 @@ ae([
     path: "app:kosdev.ddk:app",
     attribute: "ncui.agitateBeforePour"
   })
-], $.prototype, "agitateBeforePour", 2);
+], E.prototype, "agitateBeforePour", 2);
 ae([
   Ye({
-    topic: qe(ge.type),
-    lifecycle: Ve.INIT
+    topic: Ve(ge.type),
+    lifecycle: qe.INIT
   })
-], $.prototype, "updateHolder", 1);
-$ = ae([
+], E.prototype, "updateHolder", 1);
+E = ae([
   f(oe)
-], $);
-const Jt = new P({
-  class: $,
+], E);
+const Wt = new b({
+  class: E,
   type: oe
-}), kt = ["iceAgitator", "carbAgitator"], er = {
-  iceAgitator: De.factory,
-  carbAgitator: he.factory
-}, tr = A.createLogger({ name: "freestyle-assembly-data-mapper" }), ir = async (e) => {
+}), 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 T;
-    return kt.forEach((c) => {
-      var b;
-      const _ = l[c];
-      if (_) {
-        const ze = er[c](_.path);
-        n[c] = ze({
-          name: _.name,
-          path: _.path,
-          statePath: ((b = _.state) == null ? void 0 : b.path) || ""
+    var O;
+    return Zt.forEach((g) => {
+      var _;
+      const P = l[g];
+      if (P) {
+        const Ne = Qt[g](P.path);
+        n[g] = Ne({
+          name: P.name,
+          path: P.path,
+          statePath: ((_ = P.state) == null ? void 0 : _.path) || ""
         });
       }
-    }), (T = l.cartridgeAgitators) == null || T.forEach((c) => {
-      var b;
-      const _ = _e.instance(
-        c.path
+    }), (O = l.cartridgeAgitators) == null || O.forEach((g) => {
+      var _;
+      const P = be.instance(
+        g.path
       ).options({
-        name: c.name,
-        path: c.path,
-        statePath: ((b = c.state) == null ? void 0 : b.path) || ""
+        name: g.name,
+        path: g.path,
+        statePath: ((_ = g.state) == null ? void 0 : _.path) || ""
       }).build();
-      t.addModel(_);
-    }), l.remoteTrays && l.remoteTrays.forEach((c) => {
-      tr.info(`Found remote tray ${c.name} with path ${c.path}`);
-      const _ = `${E.type}-${c.holderPath}`, b = E.instance(_).options({
-        holderPath: c.holderPath,
-        configPath: c.path,
-        name: c.name
+      t.addModel(P);
+    }), l.remoteTrays && l.remoteTrays.forEach((g) => {
+      Xt.info(`Found remote tray ${g.name} with path ${g.path}`);
+      const P = `${A.type}-${g.holderPath}`, _ = A.instance(P).options({
+        holderPath: g.holderPath,
+        configPath: g.path,
+        name: g.name
       }).build();
-      r.addModel(b);
+      r.addModel(_);
     }), n;
   }, {}), a = !!s.iceAgitator, i = !!s.carbAgitator;
   return {
@@ -1010,19 +979,19 @@ const Jt = new P({
     supportsCarb: i,
     supportsIce: a
   };
-}, rr = (e) => () => (We(e)(), Xe(e)(), ne.register(), V.register(), De.register(), he.register(), te.register(), le.register(), se.register(), E.register(), re.register(), h.companion.register(e)(
+}, 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)(
   ge.type,
-  V.type
-), Jt.register(), h.companion.register(e)(
+  W.type
+), Wt.register(), h.companion.register(e)(
   Ze.type,
-  Qt
+  qt
 ), h.companion.register(e)(ke.type, le.type), h.companion.register(e)(
   et.type,
   se.type
-), x[K].register(
+), K[Y].register(
   "EnjoyByTrouble",
   async (t) => {
     if (t.data.enjoyByDate) {
@@ -1035,7 +1004,7 @@ const Jt = new P({
     }
     return {};
   }
-), x[K].register(
+), K[Y].register(
   "SuperPumpRequiredTrouble",
   // This is the trouble type
   async (t) => {
@@ -1049,7 +1018,7 @@ const Jt = new P({
       ).map((i) => i.name).join(", ")
     } : {};
   }
-), x[K].register(
+), K[Y].register(
   "MicroPumpAirDetectTrouble",
   async (t) => {
     if (t.ifaces.includes("container"))
@@ -1077,35 +1046,35 @@ const Jt = new P({
   ...Qe
 };
 y.freestyle = {
-  models: rr(y)
+  models: Jt(y)
 };
 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 nr = y;
+const ar = y;
 export {
-  Xt as A,
-  he as C,
-  V as F,
+  Vt as A,
+  pe as C,
+  W as F,
   F as I,
-  nr as K,
-  wt as N,
+  ar as K,
+  Ct as N,
   re as R,
   te as a,
   R as b,
-  _e as c,
+  be as c,
   se as d,
   ne as e,
   le as f,
-  De as g,
-  Jt as h,
-  E as i,
+  ze as g,
+  Wt as h,
+  A as i,
   ie as j,
-  St as k,
-  Ft as l,
-  ir as m,
-  yt as n,
-  rr as r
+  wt as k,
+  Dt as l,
+  rr as m,
+  pt as n,
+  Jt as r
 };
-//# sourceMappingURL=freestyle-registration-manager-CI8el36E.js.map
+//# sourceMappingURL=freestyle-registration-manager-CClN6mVr.js.map