@kosdev-code/kos-dispense-sdk 2.0.33 → 2.0.34

package/{dispense-registration-manager-CKFF29mO.js → dispense-registration-manager-eOOE05xT.js}

@@ -1,11 +1,11 @@
 var pt = Object.defineProperty;
 var ut = (e, t, r) => t in e ? pt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var o = (e, t, r) => (ut(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as I, isKosModel as v, Kos as b, resolveServiceUrl as C, ServiceFactory as S, KosLog as m, KosModelContainer as R, KosExtensionUtils as T, kosChild as M, FetchError as ht, ExtensionManager as h, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as W, getKosModelSync as z, kosDependency as ce, TroubleContainer as xe, troubleByTypeReducer as Ae, kosAction as g, kosTopicHandler as Q, DependencyLifecycle as Be, getKosModel as Ue, FutureManager as pe, kosFuture as ue, FutureHandler as Ge, isKosDataModel as gt, ChildModels as yt, KosFeatureFlags as It, kosParentAware as ft, createPropKey as mt, MultipleFutureHandler as Pt, arraysEqual as vt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as bt, destroyKosModel as _t, SingletonKosModelRegistrationFactory as Mt, KosModelRegistrationFactory as Ot, KosModelRegistry as Et, RegistrationManager as O, registerCoreModels as wt, registerLegacyModel as $t } from "@kosdev-code/kos-ui-sdk";
+import { kosModel as I, isKosModel as b, Kos as v, resolveServiceUrl as S, ServiceFactory as C, KosLog as m, KosModelContainer as R, KosExtensionUtils as N, kosChild as M, FetchError as ht, ExtensionManager as h, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as W, getKosModelSync as z, kosDependency as ce, TroubleContainer as xe, troubleByTypeReducer as Ae, kosAction as g, kosTopicHandler as Q, DependencyLifecycle as Be, getKosModel as Ue, FutureManager as pe, kosFuture as ue, FutureHandler as Ge, EXTENSION_FEATURE_FLAG_RESOLVER as gt, isKosDataModel as yt, ChildModels as It, KosFeatureFlags as ft, kosParentAware as mt, createPropKey as Pt, MultipleFutureHandler as bt, arraysEqual as vt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as _t, destroyKosModel as Mt, SingletonKosModelRegistrationFactory as Ot, KosModelRegistrationFactory as Et, KosModelRegistry as wt, RegistrationManager as O, registerCoreModels as $t, registerLegacyModel as St } from "@kosdev-code/kos-ui-sdk";
 import "react";
-var u = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e))(u || {}), D = /* @__PURE__ */ ((e) => (e.Nozzle = "nozzle-model", e.Availability = "availability-model", e.Holder = "holder-model", e.HolderContainer = "holder-container-model", e.IngredientContainer = "ingredient-container-model", e.Ingredient = "ingredient-model", e.Pump = "pump-model", e.PumpContainer = "pump-container-model", e))(D || {}), Ct = Object.defineProperty, St = Object.getOwnPropertyDescriptor, Rt = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? St(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
+var u = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(u || {}), D = /* @__PURE__ */ ((e) => (e.Nozzle = "nozzle-model", e.Availability = "availability-model", e.Holder = "holder-model", e.HolderContainer = "holder-container-model", e.IngredientContainer = "ingredient-container-model", e.Ingredient = "ingredient-model", e.Pump = "pump-model", e.PumpContainer = "pump-container-model", e))(D || {}), Ct = Object.defineProperty, Rt = Object.getOwnPropertyDescriptor, Dt = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? Rt(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
   return s && i && Ct(t, r, i), i;
 };
 const G = "ingredient-model";
@@ -15,14 +15,14 @@ let Pe = class {
     type: r,
     data: s,
     ingredientId: i,
-    ...n
+    ...a
   }) {
     o(this, "id");
     o(this, "ingredientId");
     o(this, "name");
     o(this, "type");
     o(this, "data");
-    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = s, Object.assign(this, n);
+    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = s, Object.assign(this, a);
   }
   updateModel({
     name: e,
@@ -36,7 +36,7 @@ let Pe = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-Pe = Rt([
+Pe = Dt([
   I(G)
 ], Pe);
 const je = {
@@ -47,19 +47,19 @@ const je = {
     }
   },
   type: G,
-  predicate: v(G),
-  factory: b.Factory.create(G)
-}, { URL: Fe } = C("INGREDIENT_SERVICE"), { getOne: Dt } = S.build({
+  predicate: b(G),
+  factory: v.Factory.create(G)
+}, { URL: Fe } = S("INGREDIENT_SERVICE"), { getOne: Tt } = C.build({
   basePath: `${Fe}/api/ext/dispense/ingredients`
-}), Nt = async () => await Dt({
+}), Nt = async () => await Tt({
   urlOverride: `${Fe}/api/ext/dispense/ingredients`
 });
-var Tt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, He = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? zt(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Tt(t, r, i), i;
+var zt = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, He = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? Lt(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && zt(t, r, i), i;
 };
-const j = "ingredient-container-model", Lt = m.createLogger({ name: "ingredient-container-model" });
+const j = "ingredient-container-model", xt = m.createLogger({ name: "ingredient-container-model" });
 let se = class {
   constructor(e, t) {
     o(this, "id");
@@ -80,30 +80,30 @@ let se = class {
   }
   async load(e) {
     var i;
-    Lt.debug(`loading ingredient container ${this.id}`);
+    xt.debug(`loading ingredient container ${this.id}`);
     const t = await Nt();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
-    const r = await T.executeLoaderExtension({
+    const r = await N.executeLoaderExtension({
       context: e,
       extension: u.IngredientLoader
     }), s = (t == null ? void 0 : t.data) ?? {};
-    for (const n of Object.keys(s))
-      for (const a of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[n]) || []) {
-        const c = await T.executeDataMapperExtension({
+    for (const a of Object.keys(s))
+      for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[a]) || []) {
+        const c = await N.executeDataMapperExtension({
           extension: u.IngredientMapper,
-          data: a,
+          data: n,
           contextData: r
-        }), l = await T.executePropertyMapperExtension({
+        }), l = await N.executePropertyMapperExtension({
           extension: u.IngredientTypeMapper,
-          data: a,
+          data: n,
           contextData: r
         }), p = {
-          ...a,
-          type: l || a.type,
+          ...n,
+          type: l || n.type,
           ...c,
           data: c
-        }, y = je.factory(a.id)(
+        }, y = je.factory(n.id)(
           p
         );
         this.ingredients.addModel(y);
@@ -125,42 +125,42 @@ const Ke = {
     }
   },
   type: j,
-  predicate: v(j),
-  factory: b.Singleton.create(j)
-}, { URL: he } = C("HOLDER_SERVICE"), { getAll: xt, postModel: Ve, deleteModel: At } = S.build({
+  predicate: b(j),
+  factory: v.Singleton.create(j)
+}, { URL: he } = S("HOLDER_SERVICE"), { getAll: At, postModel: Ve, deleteModel: Bt } = C.build({
   basePath: `${he}/api/kos/holders`
-}), Bt = m.createLogger({
+}), Ut = m.createLogger({
   name: "holder-service",
   group: "Services"
-}), ii = async () => await xt({}), Ut = async (e, t) => {
+}), ai = async () => await At({}), Gt = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
   return await Ve({
     model: { holderPath: e, ingredientId: t },
     urlOverride: `${he}/api/ext/dispense/assignments`
   });
-}, Gt = async (e) => {
+}, jt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await At({
+  return await Bt({
     id: e,
     urlOverride: `${he}/api/ext/dispense/assignments/${e}`
   });
-}, jt = async (e) => {
+}, Ft = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return Bt.debug(
+  return Ut.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
   ), await Ve({
     model: {},
     urlOverride: `${he}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ne } = C("ASSIGNMENT_SERVICE"), { getAll: Ft, postModel: Ye, deleteModel: Ht } = S.build({
+}, { URL: ae } = S("ASSIGNMENT_SERVICE"), { getAll: Ht, postModel: Ye, deleteModel: Kt } = C.build({
   destinationAddress: "",
-  basePath: `${ne}/api/ext/dispense/assignments`
-}), ae = window.kosUseFos, si = async () => await Ft({ fos: ae }), Kt = async (e, t) => {
-  var i, n, a, c;
-  const r = JSON.stringify(t), s = `${ne}/api/ext/dispense/assignments`;
+  basePath: `${ae}/api/ext/dispense/assignments`
+}), ne = window.kosUseFos, ni = async () => await Ht({ fos: ne }), Vt = async (e, t) => {
+  var i, a, n, c;
+  const r = JSON.stringify(t), s = `${ae}/api/ext/dispense/assignments`;
   try {
     const l = await Ye({
       model: { holderPath: e, factoryJson: r },
@@ -170,23 +170,23 @@ const Ke = {
   } catch (l) {
     if (l instanceof ht)
       return [
-        ((a = (n = l.payload) == null ? void 0 : n.data) == null ? void 0 : a.error) || "unknownError",
+        ((n = (a = l.payload) == null ? void 0 : a.data) == null ? void 0 : n.error) || "unknownError",
         (c = l.payload) == null ? void 0 : c.data
       ];
   }
   return ["unknownError", void 0];
-}, ni = async (e) => {
-  const t = ae ? `${ne}/api/ingredients/assignments/${e.holderPath}` : `${ne}/api/ext/dispense/assignments`;
+}, oi = async (e) => {
+  const t = ne ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
   return await Ye({
     model: { ...e, fuelGauge: 680 },
-    fos: ae,
+    fos: ne,
     urlOverride: t
   });
-}, ai = async (e) => await Ht({ id: e, fos: ae });
-var Vt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, ge = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Yt(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Vt(t, r, i), i;
+}, di = async (e) => await Kt({ id: e, fos: ne });
+var Yt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, ge = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? kt(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && Yt(t, r, i), i;
 };
 const F = D.Holder, De = m.createLogger({ name: "holder-model" });
 h[Me].register(
@@ -235,7 +235,7 @@ h[W].register(
     return {};
   }
 );
-class kt extends Error {
+class Zt extends Error {
   constructor(r, s) {
     super(s);
     o(this, "type");
@@ -248,8 +248,8 @@ let L = class {
     name: r,
     ingredientSource: s,
     ingredientId: i,
-    ingredientType: n,
-    slice: a,
+    ingredientType: a,
+    slice: n,
     group: c,
     data: l,
     enjoyByDate: p
@@ -268,7 +268,7 @@ let L = class {
     o(this, "pumps");
     o(this, "ingredientContainer");
     o(this, "troubleContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = n, this.ingredientSource = s, this.ingredientId = i, this.group = c, this.slice = a, this.enjoyByDate = p, this.data = l, this.pumps = new R({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = a, this.ingredientSource = s, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new R({
       parentId: e,
       sortKey: "path"
     }), this.logger = y.logger;
@@ -279,12 +279,12 @@ let L = class {
     ingredientSource: r,
     ingredientId: s,
     ingredientType: i,
-    group: n,
-    slice: a,
+    group: a,
+    slice: n,
     enjoyByDate: c,
     data: l
   }) {
-    this.path = e, this.name = t, this.ingredientId = s, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = a, this.group = n, this.data = l;
+    this.path = e, this.name = t, this.ingredientId = s, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = n, this.group = a, this.data = l;
   }
   get hasEnjoyByDate() {
     return !!this.enjoyByDate && !this.unassigned;
@@ -396,9 +396,9 @@ let L = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Kt(this.path, e);
+      const [t, r] = await Vt(this.path, e);
       if (t)
-        throw new kt(
+        throw new Zt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
@@ -411,7 +411,7 @@ let L = class {
   }
   async assignIngredient(e) {
     try {
-      e ? await Ut(this.path, e) : await Gt(this.path), g(() => {
+      e ? await Gt(this.path, e) : await jt(this.path), g(() => {
         this.ingredientId = e;
       });
     } catch (t) {
@@ -422,7 +422,7 @@ let L = class {
     return this.troubles.some((e) => e.shouldDefer);
   }
   async replaceLine() {
-    await jt(this.path);
+    await Ft(this.path);
   }
   // -------------------LIFECYCLE----------------------------
   // ----------------------------------
@@ -464,9 +464,9 @@ const ke = {
     }
   },
   type: F,
-  predicate: v(F),
-  factory: b.Factory.create(F)
-}, Zt = async (e, t) => {
+  predicate: b(F),
+  factory: v.Factory.create(F)
+}, Xt = async (e, t) => {
   var Re;
   const r = h.propertyMapper.executeMapper(
     u.HolderIngredientMapper,
@@ -474,34 +474,34 @@ const ke = {
   ), s = h.propertyMapper.executeMapper(
     u.HolderTypeMapper,
     t
-  ) || t.ingType, i = await T.executeDataMapperExtension({
+  ) || t.ingType, i = await N.executeDataMapperExtension({
     extension: u.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: n, path: a, ingredientId: c, ingType: l, ingSource: p, slice: y, ...U } = t, f = { ...U, ...i }, N = y || { pos: 0 }, re = {
-    name: n,
-    path: a,
+  }), { name: a, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...U } = t, f = { ...U, ...i }, T = y || { pos: 0 }, re = {
+    name: a,
+    path: n,
     ingredientId: r || c,
     ingredientType: s || l,
     ingredientSource: p,
     enjoyByDate: (Re = t.container) != null && Re.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
-    slice: N,
+    slice: T,
     group: e,
     data: f
   };
   return ke.factory(t.path)(re);
-}, { URL: Jt } = C("ASSEMBLY_SERVICE"), { getOne: Xt } = S.build({
+}, { URL: Jt } = S("ASSEMBLY_SERVICE"), { getOne: qt } = C.build({
   basePath: `${Jt}/api/kos/device/assemblies`
-}), qt = m.createLogger({
+}), Wt = m.createLogger({
   name: "assembly-service",
   group: "Services"
-}), Ze = async () => (qt.debug("sending GET for assembly"), await Xt({}));
-var Wt = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, ye = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Qt(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Wt(t, r, i), i;
+}), Ze = async () => (Wt.debug("sending GET for assembly"), await qt({}));
+var Qt = Object.defineProperty, er = Object.getOwnPropertyDescriptor, ye = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? er(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && Qt(t, r, i), i;
 };
-const H = "board-container-model", Je = "/kos/hardware/board/linked", Xe = "/kos/hardware/board/unlinked";
+const H = "board-container-model", Xe = "/kos/hardware/board/linked", Je = "/kos/hardware/board/unlinked";
 let x = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -532,11 +532,11 @@ let x = class {
     r.updateModel(e);
   }
   handleBoardLinkEvent(e) {
-    this.logger.debug(`handling ${Je} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
+    this.logger.debug(`handling ${Xe} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
   handleBoardUnlinkEvent(e) {
     this.logger.debug(
-      `handling ${Xe} event ${e}`
+      `handling ${Je} event ${e}`
     ), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
 };
@@ -546,30 +546,30 @@ ye([
 ye([
   Q({
     lifecycle: Be.INIT,
-    topic: Je,
+    topic: Xe,
     websocket: !0
   })
 ], x.prototype, "handleBoardLinkEvent", 1);
 ye([
   Q({
     lifecycle: Be.INIT,
-    topic: Xe,
+    topic: Je,
     websocket: !0
   })
 ], x.prototype, "handleBoardUnlinkEvent", 1);
 x = ye([
   I(H)
 ], x);
-const er = async (e) => {
+const tr = async (e) => {
   const t = e.data.boardPath, { model: r } = z(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var tr = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, qe = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? rr(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && tr(t, r, i), i;
+var rr = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, qe = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? ir(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && rr(t, r, i), i;
 };
 const K = D.PumpContainer;
 var We = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(We || {});
@@ -635,55 +635,55 @@ const Oe = {
     }
   },
   type: K,
-  predicate: v(K),
-  factory: b.Singleton.create(
+  predicate: b(K),
+  factory: v.Singleton.create(
     K
   )
 }, Qe = async (e) => {
   const t = [], { model: r } = await Ue(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, ir = async (e) => {
+}, sr = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
   const s = await Qe(r);
   return [...t, ...s];
-}, sr = async (e) => {
+}, ar = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
   const s = await Ue(
     Oe.type
   );
   if (s != null && s.model) {
-    const n = s.model.models.getIndexByKey(
+    const a = s.model.models.getIndexByKey(
       We.byBoard,
       r
     ).map(
       (c) => Qe(c.path)
     );
-    (await Promise.allSettled(n)).forEach((c) => {
+    (await Promise.allSettled(a)).forEach((c) => {
       c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
     });
   }
   return Array.from(new Set(t));
 };
-var nr = Object.defineProperty, ar = Object.getOwnPropertyDescriptor, or = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? ar(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
+var nr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, dr = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? or(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
   return s && i && nr(t, r, i), i;
 };
-const V = "board-model", Ne = (e, t) => {
-  const { type: r, name: s, path: i, linked: n, instanceId: a, link: c, ...l } = e;
-  t.type = r, t.name = s, t.path = i, t.linked = n, t.link = Object.freeze(c), t.instanceId = a, Object.assign(t, l);
+const V = "board-model", Te = (e, t) => {
+  const { type: r, name: s, path: i, linked: a, instanceId: n, link: c, ...l } = e;
+  t.type = r, t.name = s, t.path = i, t.linked = a, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
 };
 h[Me].register(
   "board",
-  sr
+  ar
 );
 h[W].register(
   "board",
-  er
+  tr
 );
-let ve = class {
+let be = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "type");
@@ -692,10 +692,10 @@ let ve = class {
     o(this, "linked");
     o(this, "instanceId");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, Ne(t, this);
+    this.id = e, this.logger = r.logger, Te(t, this);
   }
   updateModel(e) {
-    Ne(e, this);
+    Te(e, this);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -705,19 +705,19 @@ let ve = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-ve = or([
+be = dr([
   I(V)
-], ve);
+], be);
 const et = {
   registration: {
     [V]: {
-      class: ve,
+      class: be,
       singleton: !1
     }
   },
   type: V,
-  predicate: v(V),
-  factory: b.Factory.create(V)
+  predicate: b(V),
+  factory: v.Factory.create(V)
 }, tt = {
   registration: {
     [H]: {
@@ -727,17 +727,17 @@ const et = {
     ...et.registration
   },
   type: H,
-  predicate: v(H),
-  factory: b.Singleton.create(
+  predicate: b(H),
+  factory: v.Singleton.create(
     H
   )
 };
-var dr = Object.defineProperty, lr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? lr(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && dr(t, r, i), i;
+var lr = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? cr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && lr(t, r, i), i;
 };
-const Y = D.HolderContainer, cr = "/kos/insertion/insert/start", pr = "/kos/insertion/insert/complete", ur = "/kos/insertion/insert/update", hr = "/kos/insertion/remove", gr = "/kos/pumpEvent/replaceLine", yr = "/kos/handle/*";
+const Y = D.HolderContainer, pr = "/kos/insertion/insert/start", ur = "/kos/insertion/insert/complete", hr = "/kos/insertion/insert/update", gr = "/kos/insertion/remove", yr = "/kos/pumpEvent/replaceLine", Ir = "/kos/handle/*";
 let A = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -769,11 +769,11 @@ let A = class {
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
       g(() => {
-        var n, a, c;
+        var a, n, c;
         const s = r.ingredientId, i = this.holders.getModel(r.path);
         i && (this.logger.info(
           `Received insertion event for holder ${i.path}`
-        ), i.updateIngredient(s), i.slice.currentVolMl = (n = r.slice) == null ? void 0 : n.currentVolMl, i.slice.maxVolMl = (a = r.slice) == null ? void 0 : a.maxVolMl, (c = r == null ? void 0 : r.container) != null && c.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((l) => {
+        ), i.updateIngredient(s), i.slice.currentVolMl = (a = r.slice) == null ? void 0 : a.currentVolMl, i.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (c = r == null ? void 0 : r.container) != null && c.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((l) => {
           g(() => {
             const p = i.pumps.getModel(l.path);
             p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
@@ -789,7 +789,7 @@ Ie([
 ], A.prototype, "holders", 2);
 Ie([
   Q({
-    topic: yr,
+    topic: Ir,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
@@ -797,11 +797,11 @@ Ie([
 Ie([
   Q({
     topic: [
-      cr,
       pr,
       ur,
       hr,
-      gr
+      gr,
+      yr
     ],
     websocket: !0
   })
@@ -817,57 +817,57 @@ const rt = {
     }
   },
   type: Y,
-  predicate: v(Y),
-  factory: b.Singleton.create(
+  predicate: b(Y),
+  factory: v.Singleton.create(
     Y
   )
-}, Ir = m.createLogger({ name: "board-utils" }), fr = async (e) => {
-  const t = await T.executeDataMapperExtension({
+}, fr = m.createLogger({ name: "board-utils" }), mr = async (e) => {
+  const t = await N.executeDataMapperExtension({
     extension: u.BoardMapper,
     data: e,
     contextData: {}
-  }), { type: r, name: s, path: i, linked: n, instanceId: a, ...c } = e, l = { ...c, ...t }, p = {
+  }), { type: r, name: s, path: i, linked: a, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
     type: r,
     name: s,
     path: i,
-    linked: n,
-    instanceId: a,
+    linked: a,
+    instanceId: n,
     ...l
   }, y = et.factory(e.path)(p);
   return y.updateModel(p), y;
-}, mr = (e) => async (t) => {
-  Ir.debug(`adding board ${t.name}`);
-  const r = await fr(t);
+}, Pr = (e) => async (t) => {
+  fr.debug(`adding board ${t.name}`);
+  const r = await mr(t);
   e.addModel(r);
 };
 var d = /* @__PURE__ */ ((e) => (e.IDLE = "IDLE", e.POURING = "POURING", e.POUR_STARTING = "POUR_STARTING", e.POUR_CANCELING = "POUR_CANCELING", e.POUR_CANCELED = "POUR_CANCELED", e.POUR_COMPLETE = "POUR_COMPLETE", e))(d || {});
-const { URL: Ee } = C("PUMP_SERVICE"), { postModel: Pr, getOne: vr } = S.build({
+const { URL: Ee } = S("PUMP_SERVICE"), { postModel: br, getOne: vr } = C.build({
   basePath: `${Ee}/api/kos/holders`
 });
 m.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const br = async ({
+const _r = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const s = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await Pr({ model: {}, urlOverride: s, tracker: r });
+  const s = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await br({ model: {}, urlOverride: s, tracker: r });
   return i != null && i.data && pe.initiateFuture(i.data), i;
-}, _r = async (e, t) => {
+}, Mr = async (e, t) => {
   const r = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, s = await vr({ urlOverride: r });
   return s != null && s.data ? s.data : { volume: -1 };
 };
-var Mr = Object.defineProperty, Or = Object.getOwnPropertyDescriptor, we = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Or(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Mr(t, r, i), i;
+var Or = Object.defineProperty, Er = Object.getOwnPropertyDescriptor, we = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? Er(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && Or(t, r, i), i;
 };
 const k = D.Pump;
 h[Me].register(
   "pump",
-  ir
+  sr
 );
 let q = class {
   constructor(e, t) {
@@ -891,15 +891,15 @@ let q = class {
       inserted: r,
       holderPath: s,
       boardPath: i,
-      nozzlePath: n,
-      name: a,
+      nozzlePath: a,
+      name: n,
       path: c,
       childPump: l,
       virtual: p,
       prevIngredientId: y,
       ...U
     } = t;
-    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = s, this.boardPath = i, this.nozzlePath = n, this.name = a, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new Ge(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = s, this.boardPath = i, this.nozzlePath = a, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new Ge(this);
   }
   updateModel(e) {
     const {
@@ -907,12 +907,12 @@ let q = class {
       holderPath: r,
       boardPath: s,
       nozzlePath: i,
-      childPump: n,
-      name: a,
+      childPump: a,
+      name: n,
       path: c,
       ...l
     } = e;
-    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = s, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!n, this.name = a, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
+    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = s, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!a, this.name = n, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
   }
   // -------------------LIFECYCLE----------------------------
   get troubles() {
@@ -953,7 +953,7 @@ let q = class {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await _r(this.path, e);
+    return await Mr(this.path, e);
   }
   async performIntent(e, t) {
     const r = typeof e == "string" ? e : e.intent;
@@ -963,7 +963,7 @@ let q = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const s = await br({
+        const s = await _r({
           tracker: t,
           intent: r,
           pumpId: this.path
@@ -996,9 +996,9 @@ const it = {
     }
   },
   type: k,
-  predicate: v(k),
-  factory: b.Factory.create(k)
-}, Er = m.createLogger({ name: "pump-utils" }), wr = (e, t) => {
+  predicate: b(k),
+  factory: v.Factory.create(k)
+}, wr = m.createLogger({ name: "pump-utils" }), $r = (e, t) => {
   const r = (t.pumps ?? []).length > 1, s = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
@@ -1015,11 +1015,11 @@ const it = {
   return i.updateModel(s), i;
 }, st = (e) => (t) => (r) => (s) => {
   var c;
-  Er.debug(`adding pump ${s.name}`);
-  const i = wr(r.path, s);
+  wr.debug(`adding pump ${s.name}`);
+  const i = $r(r.path, s);
   e.addModel(i);
-  const n = i.holderPath, a = t.holders.getModel(n);
-  a == null || a.pumps.addModel(i), a != null && a.nozzlePaths.includes(r.path) || a == null || a.nozzlePaths.push(r.path), (c = s == null ? void 0 : s.pumps) == null || c.forEach((l) => {
+  const a = i.holderPath, n = t.holders.getModel(a);
+  n == null || n.pumps.addModel(i), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (c = s == null ? void 0 : s.pumps) == null || c.forEach((l) => {
     const p = i.holderPath, y = {
       ...l,
       childPump: !0,
@@ -1029,12 +1029,12 @@ const it = {
     st(e)(t)(r)(y);
   });
 };
-var $r = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, ee = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Cr(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && $r(t, r, i), i;
+var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, ee = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? Cr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && Sr(t, r, i), i;
 };
-const Z = "assembly-model", Sr = "assembly-data";
+const Z = "assembly-model", Rr = "assembly-data", Dr = "assembly-raw-data";
 let w = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1087,50 +1087,53 @@ let w = class {
   }
   async ready() {
     var e;
-    (e = this.troubleContainer) == null || e.troubles.increment();
+    (e = this.troubleContainer) == null || e.troubles.increment(), h[gt].execute(
+      u.AssemblyFeatureFlags,
+      this
+    );
   }
   async load(e) {
     this.logger.debug(`loading assembly ${this.id}`);
     const t = await Ze();
     if ((t == null ? void 0 : t.status) === 200) {
-      const r = await T.executeDataMapperExtension({
+      const r = await N.executeDataMapperExtension({
         extension: u.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([s, i]) => {
-        gt(i) && (this.logger.debug(`adding child model ${s} from extension data`), this[yt][s] = !0);
-      });
+      e.set(Rr, r), Object.assign(this, r), Object.entries(r).forEach(([s, i]) => {
+        yt(i) && (this.logger.debug(`adding child model ${s} from extension data`), this[It][s] = !0);
+      }), e.set(Dr, t.data);
       for await (const s of t.data.assemblies) {
         const {
           boards: i = [],
-          holders: n = {},
-          nozzles: a = [],
+          holders: a = {},
+          nozzles: n = [],
           core: c,
           name: l,
           path: p,
           ...y
         } = s;
         this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((f) => {
-          It.enableFeature(f);
+          ft.enableFeature(f);
         });
         for await (const f of i)
-          this.logger.debug(`adding board ${f.name}`), await mr(this.boardContainer)(f);
-        for await (const [f, N] of Object.entries(
-          n ?? {}
+          this.logger.debug(`adding board ${f.name}`), await Pr(this.boardContainer)(f);
+        for await (const [f, T] of Object.entries(
+          a ?? {}
         ))
-          for await (const re of N) {
+          for await (const re of T) {
             this.logger.debug(`adding holder ${re.name}`);
-            const Se = await Zt(f, re);
-            this.holderContainer.holders.addModel(Se);
+            const Ce = await Xt(f, re);
+            this.holderContainer.holders.addModel(Ce);
           }
         const U = st(this.pumpContainer)(
           this.holderContainer
         );
-        a.forEach((f) => {
+        n.forEach((f) => {
           this._nozzlePaths.add(f.path);
-          const N = U(f);
-          f.pumps.forEach(N);
+          const T = U(f);
+          f.pumps.forEach(T);
         });
       }
     }
@@ -1153,7 +1156,7 @@ ee([
 w = ee([
   I(Z)
 ], w);
-const nt = {
+const at = {
   registration: {
     [Z]: {
       class: w,
@@ -1161,16 +1164,16 @@ const nt = {
     }
   },
   type: Z,
-  predicate: v(Z),
-  factory: b.Singleton.create(Z)
+  predicate: b(Z),
+  factory: v.Singleton.create(Z)
 };
-var Rr = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, Nr = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Dr(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Rr(t, r, i), i;
+var Tr = Object.defineProperty, Nr = Object.getOwnPropertyDescriptor, zr = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? Nr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && Tr(t, r, i), i;
 };
-const J = D.Availability;
-let be = class {
+const X = D.Availability;
+let ve = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "data");
@@ -1196,25 +1199,25 @@ let be = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-be = Nr([
-  ft(),
-  I(J)
-], be);
+ve = zr([
+  mt(),
+  I(X)
+], ve);
 const _e = {
   registration: {
-    [J]: {
-      class: be,
+    [X]: {
+      class: ve,
       singleton: !1
     }
   },
-  type: J,
-  predicate: v(J),
-  factory: b.Factory.create(
-    J
+  type: X,
+  predicate: b(X),
+  factory: v.Factory.create(
+    X
   )
-}, { URL: B } = C("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Tr, getOne: zr } = S.build({
+}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Lr, getOne: xr } = C.build({
   basePath: `${B}/api/nozzle`
-}), Lr = async (e, t) => {
+}), Ar = async (e, t) => {
   const r = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
@@ -1222,7 +1225,7 @@ const _e = {
     tracker: t
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
-}, xr = async (e, t, r) => {
+}, Br = async (e, t, r) => {
   const s = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
@@ -1230,23 +1233,23 @@ const _e = {
     tracker: r
   });
   return s != null && s.data && pe.initiateFuture(s.data), s;
-}, Ar = async (e) => await zr({
+}, Ur = async (e) => await xr({
   urlOverride: `${B}${e}/pipeline/beverage/availability`
-}), Br = async (e, t) => await $e({
+}), Gr = async (e, t) => await $e({
   model: t,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), Ur = async (e) => await Tr({
+}), jr = async (e) => await Lr({
   id: e,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
-var Gr = Object.defineProperty, jr = Object.getOwnPropertyDescriptor, te = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? jr(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Gr(t, r, i), i;
+var Fr = Object.defineProperty, Hr = Object.getOwnPropertyDescriptor, te = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? Hr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && Fr(t, r, i), i;
 };
-const X = D.Nozzle, Fr = mt(
+const J = D.Nozzle, Kr = Pt(
   "beverageTopicPrefix"
-), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Te = "/kos/nozzle/pour/started", Hr = "/kos/nozzle/pour/progress", fe = "/kos/nozzle/pour/cancel";
+), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Ne = "/kos/nozzle/pour/started", Vr = "/kos/nozzle/pour/progress", fe = "/kos/nozzle/pour/cancel";
 let $ = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1263,7 +1266,7 @@ let $ = class {
     o(this, "beverageTopicPrefix");
     o(this, "topicPrefix");
     o(this, "urlPrefix");
-    this.id = e, this.path = t.path, this.name = t.name, this.beverageTopicPrefix = t.beverageTopicPrefix, this.topicPrefix = t.topicPrefix, this.urlPrefix = t.urlPrefix, this._selectedBeverage = void 0, this._selectedBrand = void 0, this._additionalItems = [], this.futureHandler = new Pt(this), this._availabilityItems = new R({
+    this.id = e, this.path = t.path, this.name = t.name, this.beverageTopicPrefix = t.beverageTopicPrefix, this.topicPrefix = t.topicPrefix, this.urlPrefix = t.urlPrefix, this._selectedBeverage = void 0, this._selectedBrand = void 0, this._additionalItems = [], this.futureHandler = new bt(this), this._availabilityItems = new R({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
@@ -1355,7 +1358,7 @@ let $ = class {
     context: r
   }) {
     if (!e) {
-      const c = await Ur(this.name);
+      const c = await jr(this.name);
       if ((c == null ? void 0 : c.status) !== 200)
         throw new Error("Failed to clear pourable");
       this._selectedBeverage = void 0;
@@ -1380,8 +1383,8 @@ let $ = class {
     (!s || Object.keys(s).length === 0) && (this.logger.info(
       `No selected pourable mapper defined, using the default payload ${i}`
     ), s = i);
-    const n = s ?? i, a = await Br(this.name, n);
-    if ((a == null ? void 0 : a.status) !== 200)
+    const a = s ?? i, n = await Gr(this.name, a);
+    if ((n == null ? void 0 : n.status) !== 200)
       throw new Error("Failed to select pourable");
   }
   /**
@@ -1434,7 +1437,7 @@ let $ = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Hr, r), e.endState && g(() => {
+    _.publish(Vr, r), e.endState && g(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1444,16 +1447,16 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const r = await Lr(this.name, e);
+        const r = await Ar(this.name, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
-          var n;
-          ie(i) && ((n = i.onPourStart) == null || n.call(i));
+          var a;
+          ie(i) && ((a = i.onPourStart) == null || a.call(i));
         });
         const s = {
           nozzleId: this.id,
           type: "free"
         };
-        if (_.publish(Te, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Ne, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             nozzleId: this.id
@@ -1473,23 +1476,23 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const s = await xr(e, this.name, t);
+        const s = await Br(e, this.name, t);
         this.currentState === d.POUR_STARTING && g(() => {
           this.currentState = d.POURING;
-        }), E(this).forEach((n) => {
-          var a;
-          ie(n) && ((a = n.onPourStart) == null || a.call(n));
+        }), E(this).forEach((a) => {
+          var n;
+          ie(a) && ((n = a.onPourStart) == null || n.call(a));
         });
         const i = {
           nozzleId: this.id,
           type: "fixed"
         };
-        if (_.publish(Te, i), (r = s == null ? void 0 : s.data) != null && r.endState) {
+        if (_.publish(Ne, i), (r = s == null ? void 0 : s.data) != null && r.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
-          const n = {
+          const a = {
             nozzleId: this.id
           };
-          _.publish(fe, n);
+          _.publish(fe, a);
         }
         return s;
       } else
@@ -1531,68 +1534,68 @@ let $ = class {
   async load(e) {
     var s, i;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await Ar(this.urlPrefix);
+    const t = await Ur(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
     const r = await h.loader.executeLoader(
       u.AvailabilityLoader,
       {}
     );
-    e == null || e.set(u.AvailabilityLoader, r), e == null || e.set(Ce.type, this);
-    for (const n of Object.keys((s = t.data) == null ? void 0 : s.groups) || [])
-      for (const a of ((i = t.data) == null ? void 0 : i.groups[n]) || []) {
+    e == null || e.set(u.AvailabilityLoader, r), e == null || e.set(Se.type, this);
+    for (const a of Object.keys((s = t.data) == null ? void 0 : s.groups) || [])
+      for (const n of ((i = t.data) == null ? void 0 : i.groups[a]) || []) {
         const c = await h.dataMapper.executeMapper(
           u.AvailabilityMapper,
-          { ...a, groupId: n },
+          { ...n, groupId: a },
           r
         ), l = {
-          ...a,
-          note: a.note ?? void 0,
+          ...n,
+          note: n.note ?? void 0,
           kosParentId: this.id,
-          rawId: a.id,
-          groupId: n,
+          rawId: n.id,
+          groupId: a,
           data: c,
-          properties: a.properties || {}
+          properties: n.properties || {}
         }, p = _e.factory(
-          `${this.id}-${n}-${a.id}`
+          `${this.id}-${a}-${n.id}`
         )(l);
         this._availabilityItems.addModel(p);
       }
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = bt.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
+    const t = _t.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
     if (e.rebuild)
       for (const s of Object.keys(e == null ? void 0 : e.groups) || []) {
         this._availabilityItems.getIndexByKey("group", s).filter(
-          (n) => !e.groups[s].find(
-            (a) => `${this.id}-${s}-${a.id}` === n.id
+          (a) => !e.groups[s].find(
+            (n) => `${this.id}-${s}-${n.id}` === a.id
           )
-        ).forEach((n) => {
-          this._availabilityItems.removeModel(n.id), _t(n);
+        ).forEach((a) => {
+          this._availabilityItems.removeModel(a.id), Mt(a);
         });
-        for (const n of (e == null ? void 0 : e.groups[s]) || []) {
-          const a = await h.dataMapper.executeMapper(
+        for (const a of (e == null ? void 0 : e.groups[s]) || []) {
+          const n = await h.dataMapper.executeMapper(
             u.AvailabilityMapper,
-            { ...n, groupId: s },
+            { ...a, groupId: s },
             r
           ), c = {
-            ...n,
-            note: n.note ?? void 0,
+            ...a,
+            note: a.note ?? void 0,
             kosParentId: this.id,
             groupId: s,
-            rawId: n.id,
-            data: a,
-            taggedIds: n.taggedIds,
-            properties: n.properties || {}
+            rawId: a.id,
+            data: n,
+            taggedIds: a.taggedIds,
+            properties: a.properties || {}
           }, l = this._availabilityItems.getModel(
-            `${this.id}-${s}-${n.id}`
+            `${this.id}-${s}-${a.id}`
           );
           if (l)
             l.updateModel(c);
           else {
             const p = _e.factory(
-              `${this.id}-${s}-${n.id}`
+              `${this.id}-${s}-${a.id}`
             )(c);
             this._availabilityItems.addModel(p);
           }
@@ -1601,24 +1604,24 @@ let $ = class {
     else
       for (const s of Object.keys(e == null ? void 0 : e.groups) || [])
         for (const i of (e == null ? void 0 : e.groups[s]) || []) {
-          const n = await h.dataMapper.executeMapper(
+          const a = await h.dataMapper.executeMapper(
             u.AvailabilityMapper,
             { ...i, groupId: s },
             r
-          ), a = {
+          ), n = {
             ...i,
             note: i.note ?? void 0,
             kosParentId: this.id,
             groupId: s,
             rawId: i.id,
-            data: n,
+            data: a,
             type: i.type,
             taggedIds: i.taggedIds,
             properties: i.properties || {}
           }, c = this._availabilityItems.getModel(
             `${this.id}-${s}-${i.id}`
           );
-          c && c.updateModel(a);
+          c && c.updateModel(n);
         }
     this.updateGroupMembers();
   }
@@ -1635,28 +1638,28 @@ te([
 ], $.prototype, "fixedPour", 1);
 te([
   Q({
-    topic: `${Fr}/availability`,
+    topic: `${Kr}/availability`,
     websocket: !0
   })
 ], $.prototype, "updateAvailability", 1);
 $ = te([
-  I(X)
+  I(J)
 ], $);
-const Ce = {
+const Se = {
   registration: {
-    [X]: {
+    [J]: {
       class: $,
       singleton: !1
     }
   },
-  type: X,
-  predicate: v(X),
-  factory: b.Factory.create(X)
+  type: J,
+  predicate: b(J),
+  factory: v.Factory.create(J)
 };
-var Kr = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, at = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Vr(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Kr(t, r, i), i;
+var Yr = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, nt = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? kr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && Yr(t, r, i), i;
 };
 const ot = "device-assembly-model";
 let de = class {
@@ -1680,31 +1683,31 @@ let de = class {
     this.logger.debug(`loading device-assembly ${this.id}`);
     const e = await Ze();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles ?? []).flat().forEach((r) => {
-      var a;
-      const s = r.path, i = ((a = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : a.topicPrefix) || "", n = Ce.factory(s)({
+      var n;
+      const s = r.path, i = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", a = Se.factory(s)({
         path: r.path,
         name: r.name,
         urlPrefix: r.urlPrefix,
         topicPrefix: r.topicPrefix,
         beverageTopicPrefix: i
       });
-      this.deviceNozzles.addModel(n);
+      this.deviceNozzles.addModel(a);
     });
   }
 };
-at([
+nt([
   M
 ], de.prototype, "deviceNozzles", 2);
-de = at([
+de = nt([
   I(ot)
 ], de);
-const Yr = new Mt({
+const Zr = new Ot({
   class: de,
   type: ot
-}), { URL: dt } = C("GENERIC_POUR_SERVICE"), { postModel: kr } = S.build({
+}), { URL: dt } = S("GENERIC_POUR_SERVICE"), { postModel: Xr } = C.build({
   basePath: `${dt}/api/nozzle`
-}), Zr = async (e, t) => {
-  const r = await kr({
+}), Jr = async (e, t) => {
+  const r = await Xr({
     model: {},
     urlOverride: `${dt}${e}`,
     ordered: !0,
@@ -1712,12 +1715,12 @@ const Yr = new Mt({
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
 };
-var Jr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, lt = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Xr(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (i = (s ? a(t, r, i) : a(i)) || i);
-  return s && i && Jr(t, r, i), i;
+var qr = Object.defineProperty, Wr = Object.getOwnPropertyDescriptor, lt = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? Wr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
+  return s && i && qr(t, r, i), i;
 };
-const ct = "generic-pour-model", qr = "/kos/generic/pour/started", Wr = "/kos/generic/pour/progress", ze = "/kos/generic/pour/cancel", me = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+const ct = "generic-pour-model", Qr = "/kos/generic/pour/started", ei = "/kos/generic/pour/progress", ze = "/kos/generic/pour/cancel", me = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
 let le = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1738,16 +1741,16 @@ let le = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const r = await Zr(this.servicePath, e);
+        const r = await Jr(this.servicePath, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
-          var n;
-          me(i) && ((n = i.onPourStart) == null || n.call(i));
+          var a;
+          me(i) && ((a = i.onPourStart) == null || a.call(i));
         });
         const s = {
           pourTarget: this.id,
           type: this.pourType
         };
-        if (_.publish(qr, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Qr, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             pourTarget: this.id
@@ -1823,7 +1826,7 @@ let le = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Wr, t), e.endState && g(() => {
+    _.publish(ei, t), e.endState && g(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1841,7 +1844,7 @@ lt([
 le = lt([
   I(ct)
 ], le);
-const oi = new Ot({
+const li = new Et({
   class: le,
   type: ct
 }), Le = {
@@ -1849,26 +1852,26 @@ const oi = new Ot({
   ...je.registration,
   ...rt.registration,
   ...ke.registration,
-  ...Ce.registration,
+  ...Se.registration,
   ...it.registration,
   ...Oe.registration,
   ..._e.registration,
-  ...nt.registration,
+  ...at.registration,
   ...tt.registration
-}, Qr = (e) => () => (wt(e)(), Yr.register(), Object.keys(Le).forEach((t) => {
+}, ti = (e) => () => ($t(e)(), Zr.register(), Object.keys(Le).forEach((t) => {
   const r = Le[t];
-  $t(e)(t, r);
+  St(e)(t, r);
 }), h[W].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
       const { model: s } = z(
-        nt.type
+        at.type
       );
       if (s) {
         const i = s.boards.find(
-          (n) => n.id === t.data.deviceId
+          (a) => a.id === t.data.deviceId
         ) ? z(t.data.deviceId).model : void 0;
         return {
           devices: i ? i.name : ""
@@ -1883,57 +1886,59 @@ const oi = new Ot({
   companion: O.companion.register(e),
   legacy: O.model.registerLegacyModel(e)
 }), P = {
-  ...Et
+  ...wt
 };
 P.dispense = {
-  models: Qr(P)
+  models: ti(P)
 };
 P.preload = O.model.preloadModel(P);
 P.model = O.model.register(P);
 P.companion = O.companion.register(P);
 P.legacy = O.model.registerLegacyModel(P);
-const di = P;
+const ci = P;
 export {
-  nt as A,
+  at as A,
   x as B,
-  xr as C,
+  Rr as C,
   D,
   u as E,
-  Lr as F,
-  oi as G,
+  Ur as F,
+  li as G,
   ke as H,
   je as I,
   Br as J,
-  di as K,
-  Zr as L,
-  Ce as N,
+  ci as K,
+  Ar as L,
+  Gr as M,
+  Se as N,
+  Jr as O,
   it as P,
-  Je as T,
-  _e as a,
-  Xe as b,
-  tt as c,
-  et as d,
-  Yr as e,
-  rt as f,
-  Ke as g,
-  Oe as h,
-  We as i,
-  d as j,
+  Xe as T,
+  Dr as a,
+  _e as b,
+  Je as c,
+  tt as d,
+  et as e,
+  Zr as f,
+  rt as g,
+  Ke as h,
+  Oe as i,
+  We as j,
   Le as k,
-  Nt as l,
-  ni as m,
-  Ut as n,
-  ai as o,
-  si as p,
-  ii as q,
-  Qr as r,
-  jt as s,
-  Kt as t,
-  Gt as u,
-  Ze as v,
-  _r as w,
-  br as x,
-  Ur as y,
-  Ar as z
+  d as l,
+  Nt as m,
+  oi as n,
+  Gt as o,
+  di as p,
+  ni as q,
+  ti as r,
+  ai as s,
+  Ft as t,
+  Vt as u,
+  jt as v,
+  Ze as w,
+  Mr as x,
+  _r as y,
+  jr as z
 };
-//# sourceMappingURL=dispense-registration-manager-CKFF29mO.js.map
+//# sourceMappingURL=dispense-registration-manager-eOOE05xT.js.map