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

package/{dispense-registration-manager-kSiG2s8S.js → dispense-registration-manager-DgMTZL-g.js}

@@ -1,20 +1,20 @@
-var gt = Object.defineProperty;
-var ut = (e, t, r) => t in e ? gt(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 P, Kos as v, isKosModel as b, resolveServiceUrl as N, ServiceFactory as $, KosLog as m, KosModelContainer as D, KosExtensionUtils as A, kosChild as _, FetchError as Pt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as ee, getKosModelSync as z, kosDependency as xe, kosTroubleAware as yt, kosAction as O, kosTopicHandler as te, DependencyLifecycle as pe, getKosModel as Be, FutureManager as he, kosFuture as ge, FutureHandler as Ge, EXTENSION_FEATURE_FLAG_RESOLVER as It, isKosDataModel as mt, ChildModels as ft, KosFeatureFlags as vt, kosParentAware as bt, createPropKey as Ot, kosStateEntry as ue, kosStateExit as Pe, kosStateGuard as re, kosLoggerAware as je, kosStateMachine as Fe, MultipleFutureHandler as _t, arraysEqual as Et, getAllKosCompanionModels as U, EventBus as R, KosContextManager as Mt, destroyKosModel as wt, SingletonKosModelRegistrationFactory as Rt, kosFutureAware as Ct, ObservableData as Te, KosModelRegistrationFactory as Nt, KosModelRegistry as $t, RegistrationManager as w, registerCoreModels as Dt, registerLegacyModel as St } from "@kosdev-code/kos-ui-sdk";
+var ut = Object.defineProperty;
+var Pt = (e, t, r) => t in e ? ut(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var o = (e, t, r) => (Pt(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { kosModel as y, Kos as v, isKosModel as b, resolveServiceUrl as D, ServiceFactory as S, KosLog as m, KosModelContainer as T, KosExtensionUtils as U, kosChild as _, FetchError as yt, ExtensionManager as P, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as te, getKosModelSync as x, kosDependency as Be, kosTroubleAware as It, kosAction as O, kosTopicHandler as re, DependencyLifecycle as pe, getKosModel as Ge, FutureManager as he, kosFuture as ge, FutureHandler as je, EXTENSION_FEATURE_FLAG_RESOLVER as mt, isKosDataModel as ft, ChildModels as vt, KosFeatureFlags as bt, kosParentAware as Ot, createPropKey as _t, kosStateEntry as ue, kosStateExit as Pe, kosStateGuard as ae, kosLoggerAware as Fe, kosStateMachine as He, MultipleFutureHandler as Et, arraysEqual as Mt, getAllKosCompanionModels as z, EventBus as $, KosContextManager as wt, destroyKosModel as Rt, SingletonKosModelRegistrationFactory as Ct, kosFutureAware as $t, ObservableData as Te, KosModelRegistrationFactory as Nt, KosModelRegistry as Dt, RegistrationManager as R, registerCoreModels as St, registerLegacyModel as Tt } from "@kosdev-code/kos-ui-sdk";
 import "react";
-var h = /* @__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))(h || {}), S = /* @__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))(S || {}), Tt = Object.getOwnPropertyDescriptor, Lt = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? Tt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = n(a) || a);
-  return a;
+var g = /* @__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))(g || {}), L = /* @__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))(L || {}), Lt = Object.getOwnPropertyDescriptor, At = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Lt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = n(i) || i);
+  return i;
 };
-const F = "ingredient-model";
+const H = "ingredient-model";
 let be = class {
   constructor(e, {
     name: t,
     type: r,
-    data: i,
-    ingredientId: a,
+    data: a,
+    ingredientId: i,
     ...s
   }) {
     o(this, "id");
@@ -22,53 +22,53 @@ let be = class {
     o(this, "name");
     o(this, "type");
     o(this, "data");
-    this.id = e, this.ingredientId = a, this.name = t, this.type = r, this.data = i, Object.assign(this, s);
+    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = a, Object.assign(this, s);
   }
   updateModel({
     name: e,
     type: t,
     data: r,
-    ingredientId: i,
-    ...a
+    ingredientId: a,
+    ...i
   }) {
-    this.name = e, this.type = t, this.ingredientId = i, this.data = r, Object.assign(this, a);
+    this.name = e, this.type = t, this.ingredientId = a, this.data = r, Object.assign(this, i);
   }
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-be = Lt([
-  P(F)
+be = At([
+  y(H)
 ], be);
-const He = {
+const Ve = {
   registration: {
-    [F]: {
+    [H]: {
       class: be,
       singleton: !1
     }
   },
-  type: F,
-  predicate: b(F),
-  factory: v.Factory.create(F)
-}, { URL: Ve } = N("INGREDIENT_SERVICE"), { getOne: At } = $.build({
-  basePath: `${Ve}/api/ext/dispense/ingredients`
-}), Ut = async () => await At({
-  urlOverride: `${Ve}/api/ext/dispense/ingredients`
+  type: H,
+  predicate: b(H),
+  factory: v.Factory.create(H)
+}, { URL: Ke } = D("INGREDIENT_SERVICE"), { getOne: Ut } = S.build({
+  basePath: `${Ke}/api/ext/dispense/ingredients`
+}), zt = async () => await Ut({
+  urlOverride: `${Ke}/api/ext/dispense/ingredients`
 });
-var zt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, Ke = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? xt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && zt(t, r, a), a;
+var xt = Object.defineProperty, Bt = Object.getOwnPropertyDescriptor, ke = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Bt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && xt(t, r, i), i;
 };
-const H = "ingredient-container-model", Bt = m.createLogger({ name: "ingredient-container-model" });
+const V = "ingredient-container-model", Gt = m.createLogger({ name: "ingredient-container-model" });
 let se = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "ingredients");
-    this.id = e, this.ingredients = new D({
+    this.id = e, this.ingredients = new T({
       indexMap: {
         ingredientType: "type"
       },
-      extensionId: h.IngredientIndex,
+      extensionId: g.IngredientIndex,
       parentId: e
     });
   }
@@ -79,31 +79,31 @@ let se = class {
     return this.ingredients.getIndexByKey("ingredientType", e);
   }
   async load(e) {
-    var a;
-    Bt.debug(`loading ingredient container ${this.id}`);
-    const t = await Ut();
+    var i;
+    Gt.debug(`loading ingredient container ${this.id}`);
+    const t = await zt();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
-    const r = await A.executeLoaderExtension({
+    const r = await U.executeLoaderExtension({
       context: e,
-      extension: h.IngredientLoader
-    }), i = (t == null ? void 0 : t.data) ?? {};
-    for (const s of Object.keys(i))
-      for (const n of ((a = t == null ? void 0 : t.data) == null ? void 0 : a[s]) || []) {
-        const c = await A.executeDataMapperExtension({
-          extension: h.IngredientMapper,
+      extension: g.IngredientLoader
+    }), a = (t == null ? void 0 : t.data) ?? {};
+    for (const s of Object.keys(a))
+      for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[s]) || []) {
+        const l = await U.executeDataMapperExtension({
+          extension: g.IngredientMapper,
           data: n,
           contextData: r
-        }), l = await A.executePropertyMapperExtension({
-          extension: h.IngredientTypeMapper,
+        }), c = await U.executePropertyMapperExtension({
+          extension: g.IngredientTypeMapper,
           data: n,
           contextData: r
         }), p = {
           ...n,
-          type: l || n.type,
-          ...c,
-          data: c
-        }, u = He.factory(n.id)(
+          type: c || n.type,
+          ...l,
+          data: l
+        }, u = Ve.factory(n.id)(
           p
         );
         this.ingredients.addModel(u);
@@ -111,100 +111,100 @@ let se = class {
   }
   // -------------------ENTITY----------------------------
 };
-Ke([
+ke([
   _
 ], se.prototype, "ingredients", 2);
-se = Ke([
-  P(H)
+se = ke([
+  y(V)
 ], se);
-const ke = {
+const Ye = {
   registration: {
-    [H]: {
+    [V]: {
       class: se,
       singleton: !0
     }
   },
-  type: H,
-  predicate: b(H),
-  factory: v.Singleton.create(H)
-}, { URL: ye } = N("HOLDER_SERVICE"), { getAll: Gt, postModel: Ye, deleteModel: jt } = $.build({
+  type: V,
+  predicate: b(V),
+  factory: v.Singleton.create(V)
+}, { URL: ye } = D("HOLDER_SERVICE"), { getAll: jt, postModel: Ze, deleteModel: Ft } = S.build({
   basePath: `${ye}/api/kos/holders`
-}), Ft = m.createLogger({
+}), Ht = m.createLogger({
   name: "holder-service",
   group: "Services"
-}), di = async () => await Gt({}), Ht = async (e, t) => {
+}), da = async () => await jt({}), Vt = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
-  return await Ye({
+  return await Ze({
     model: { holderPath: e, ingredientId: t },
     urlOverride: `${ye}/api/ext/dispense/assignments`
   });
-}, Vt = async (e) => {
+}, Kt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await jt({
+  return await Ft({
     id: e,
     urlOverride: `${ye}/api/ext/dispense/assignments/${e}`
   });
-}, Kt = async (e) => {
+}, kt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return Ft.debug(
+  return Ht.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
-  ), await Ye({
+  ), await Ze({
     model: {},
     urlOverride: `${ye}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ne } = N("ASSIGNMENT_SERVICE"), { getAll: kt, postModel: Ze, deleteModel: Yt } = $.build({
+}, { URL: ne } = D("ASSIGNMENT_SERVICE"), { getAll: Yt, postModel: Xe, deleteModel: Zt } = S.build({
   destinationAddress: "",
   basePath: `${ne}/api/ext/dispense/assignments`
-}), oe = window.kosUseFos, li = async () => await kt({ fos: oe }), Zt = async (e, t) => {
-  var a, s, n, c;
-  const r = JSON.stringify(t), i = `${ne}/api/ext/dispense/assignments`;
+}), oe = window.kosUseFos, la = async () => await Yt({ fos: oe }), Xt = async (e, t) => {
+  var i, s, n, l;
+  const r = JSON.stringify(t), a = `${ne}/api/ext/dispense/assignments`;
   try {
-    const l = await Ze({
+    const c = await Xe({
       model: { holderPath: e, factoryJson: r },
-      urlOverride: i
+      urlOverride: a
     });
-    return (l == null ? void 0 : l.status) === 200 && ((a = l == null ? void 0 : l.data) != null && a.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
-  } catch (l) {
-    if (l instanceof Pt)
+    return (c == null ? void 0 : c.status) === 200 && ((i = c == null ? void 0 : c.data) != null && i.error) ? [c.data.error || "unknownError", c.data] : [void 0, c == null ? void 0 : c.data];
+  } catch (c) {
+    if (c instanceof yt)
       return [
-        ((n = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : n.error) || "unknownError",
-        (c = l.payload) == null ? void 0 : c.data
+        ((n = (s = c.payload) == null ? void 0 : s.data) == null ? void 0 : n.error) || "unknownError",
+        (l = c.payload) == null ? void 0 : l.data
       ];
   }
   return ["unknownError", void 0];
-}, ci = async (e) => {
+}, ca = async (e) => {
   const t = oe ? `${ne}/api/ingredients/assignments/${e.holderPath}` : `${ne}/api/ext/dispense/assignments`;
-  return await Ze({
+  return await Xe({
     model: { ...e, fuelGauge: 680 },
     fos: oe,
     urlOverride: t
   });
-}, pi = async (e) => await Yt({ id: e, fos: oe });
-var Xt = Object.defineProperty, Jt = Object.getOwnPropertyDescriptor, we = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? Jt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && Xt(t, r, a), a;
+}, pa = async (e) => await Zt({ id: e, fos: oe });
+var Jt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, we = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? qt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Jt(t, r, i), i;
 };
-const V = S.Holder, Le = m.createLogger({ name: "holder-model" });
-g[Me].register(
+const K = L.Holder, Le = m.createLogger({ name: "holder-model" });
+P[Me].register(
   "holder",
   async (e) => {
     const t = [];
     return t.push(...e.data.holderPaths), t;
   }
 );
-g[ee].register(
+P[te].register(
   "pump",
   async (e) => {
     if (e.data.pumpPath) {
-      const { model: t } = z(
+      const { model: t } = x(
         e.data.pumpPath
       );
       if (t) {
-        const r = t.ingredientId ? z(t.ingredientId).model : void 0;
+        const r = t.ingredientId ? x(t.ingredientId).model : void 0;
         return {
           ingredientId: t.ingredientId,
           ingredientName: (r == null ? void 0 : r.displayName) ?? ((r == null ? void 0 : r.name) || ""),
@@ -215,17 +215,17 @@ g[ee].register(
     return {};
   }
 );
-g[ee].register(
+P[te].register(
   "holder",
   async (e) => e.data.holderNames.length > 0 ? {
     holderName: e.data.holderNames[0] || ""
   } : {}
 );
-g[ee].register(
+P[te].register(
   "container",
   async (e) => {
     if (e.data.ingredients.length > 0) {
-      const t = e.data.ingredients[0], { model: r } = z(t);
+      const t = e.data.ingredients[0], { model: r } = x(t);
       return {
         ingredientName: (r == null ? void 0 : r.displayName) ?? ((r == null ? void 0 : r.name) || ""),
         ingredients: e.data.ingredients ? e.data.ingredients : [],
@@ -235,23 +235,23 @@ g[ee].register(
     return {};
   }
 );
-class qt extends Error {
-  constructor(r, i) {
-    super(i);
+class Wt extends Error {
+  constructor(r, a) {
+    super(a);
     o(this, "type");
     this.name = "AssignmentError", this.type = r;
   }
 }
-let Q = class {
+let ee = class {
   constructor(e, {
     path: t,
     name: r,
-    ingredientSource: i,
-    ingredientId: a,
+    ingredientSource: a,
+    ingredientId: i,
     ingredientType: s,
     slice: n,
-    group: c,
-    data: l,
+    group: l,
+    data: c,
     enjoyByDate: p
   }, u) {
     o(this, "id");
@@ -267,7 +267,7 @@ let Q = class {
     o(this, "enjoyByDate");
     o(this, "pumps");
     o(this, "ingredientContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = i, this.ingredientId = a, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new D({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = l, this.slice = n, this.enjoyByDate = p, this.data = c, this.pumps = new T({
       parentId: e,
       sortKey: "path"
     }), this.logger = u.logger;
@@ -276,14 +276,14 @@ let Q = class {
     path: e,
     name: t,
     ingredientSource: r,
-    ingredientId: i,
-    ingredientType: a,
+    ingredientId: a,
+    ingredientType: i,
     group: s,
     slice: n,
-    enjoyByDate: c,
-    data: l
+    enjoyByDate: l,
+    data: c
   }) {
-    this.path = e, this.name = t, this.ingredientId = i, this.ingredientType = a, this.ingredientSource = r, this.enjoyByDate = c, this.slice = n, this.group = s, this.data = l;
+    this.path = e, this.name = t, this.ingredientId = a, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = l, this.slice = n, this.group = s, this.data = c;
   }
   get hasEnjoyByDate() {
     return !!this.enjoyByDate && !this.unassigned;
@@ -308,8 +308,8 @@ let Q = class {
     return this.logger.debug(`isPouring: ${!!e}`), e;
   }
   async performIntent(e) {
-    const t = typeof e == "string" ? e : e.intent, r = typeof e == "string" ? void 0 : e.pumpPath, i = r ? this.pumps.getModel(r) : this.pumps.data[0];
-    return i == null ? void 0 : i.performIntent({ intent: t });
+    const t = typeof e == "string" ? e : e.intent, r = typeof e == "string" ? void 0 : e.pumpPath, a = r ? this.pumps.getModel(r) : this.pumps.data[0];
+    return a == null ? void 0 : a.performIntent({ intent: t });
   }
   get pourState() {
     return this.pumps.data.reduce((t, r) => r.pouringState ? r.pouringState : t, "");
@@ -383,9 +383,9 @@ let Q = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Zt(this.path, e);
+      const [t, r] = await Xt(this.path, e);
       if (t)
-        throw new qt(
+        throw new Wt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
@@ -398,7 +398,7 @@ let Q = class {
   }
   async assignIngredient(e) {
     try {
-      e ? await Ht(this.path, e) : await Vt(this.path), O(() => {
+      e ? await Vt(this.path, e) : await Kt(this.path), O(() => {
         this.ingredientId = e;
       });
     } catch (t) {
@@ -409,7 +409,7 @@ let Q = class {
     return this.troubles.some((e) => e.shouldDefer);
   }
   async replaceLine() {
-    await Kt(this.path);
+    await kt(this.path);
   }
   // -------------------LIFECYCLE----------------------------
   // ----------------------------------
@@ -433,68 +433,68 @@ let Q = class {
 };
 we([
   _
-], Q.prototype, "pumps", 2);
+], ee.prototype, "pumps", 2);
 we([
-  xe({ modelType: ke.type })
-], Q.prototype, "ingredientContainer", 2);
-Q = we([
-  P(V),
-  yt()
-], Q);
-const Xe = {
+  Be({ modelType: Ye.type })
+], ee.prototype, "ingredientContainer", 2);
+ee = we([
+  y(K),
+  It()
+], ee);
+const Je = {
   registration: {
-    [V]: {
-      class: Q,
+    [K]: {
+      class: ee,
       singleton: !1
     }
   },
-  type: V,
-  predicate: b(V),
-  factory: v.Factory.create(V)
-}, Wt = async (e, t) => {
+  type: K,
+  predicate: b(K),
+  factory: v.Factory.create(K)
+}, Qt = async (e, t) => {
   var Se;
-  const r = g.propertyMapper.executeMapper(
-    h.HolderIngredientMapper,
+  const r = P.propertyMapper.executeMapper(
+    g.HolderIngredientMapper,
     t
-  ), i = g.propertyMapper.executeMapper(
-    h.HolderTypeMapper,
+  ), a = P.propertyMapper.executeMapper(
+    g.HolderTypeMapper,
     t
-  ) || t.ingType, a = await A.executeDataMapperExtension({
-    extension: h.HolderMapper,
+  ) || t.ingType, i = await U.executeDataMapperExtension({
+    extension: g.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: s, path: n, ingredientId: c, ingType: l, ingSource: p, slice: u, ...j } = t, y = { ...j, ...a }, L = u || { pos: 0 }, ae = {
+  }), { name: s, path: n, ingredientId: l, ingType: c, ingSource: p, slice: u, ...F } = t, h = { ...F, ...i }, M = u || { pos: 0 }, C = {
     name: s,
     path: n,
-    ingredientId: r || c,
-    ingredientType: i || l,
+    ingredientId: r || l,
+    ingredientType: a || c,
     ingredientSource: p,
     enjoyByDate: (Se = t.container) != null && Se.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
-    slice: L,
+    slice: M,
     group: e,
-    data: y
+    data: h
   };
-  return Xe.factory(t.path)(ae);
-}, { URL: Qt } = N("ASSEMBLY_SERVICE"), { getOne: er } = $.build({
-  basePath: `${Qt}/api/kos/device/assemblies`
-}), tr = m.createLogger({
+  return Je.factory(t.path)(C);
+}, { URL: er } = D("ASSEMBLY_SERVICE"), { getOne: tr } = S.build({
+  basePath: `${er}/api/kos/device/assemblies`
+}), rr = m.createLogger({
   name: "assembly-service",
   group: "Services"
-}), Je = async () => (tr.debug("sending GET for assembly"), await er({}));
-var rr = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, Ie = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? ir(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && rr(t, r, a), a;
+}), qe = async () => (rr.debug("sending GET for assembly"), await tr({}));
+var ar = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, Ie = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? ir(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && ar(t, r, i), i;
 };
-const K = "board-container-model", qe = "/kos/hardware/board/linked", We = "/kos/hardware/board/unlinked";
-let x = class {
+const k = "board-container-model", We = "/kos/hardware/board/linked", Qe = "/kos/hardware/board/unlinked";
+let B = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
     o(this, "models");
-    this.id = e, this.logger = r.logger, this.models = new D({
+    this.id = e, this.logger = r.logger, this.models = new T({
       parentId: e,
-      extensionId: h.BoardIndex
+      extensionId: g.BoardIndex
     });
   }
   get boardList() {
@@ -517,59 +517,59 @@ let x = class {
     r.updateModel(e);
   }
   handleBoardLinkEvent(e) {
-    this.logger.debug(`handling ${qe} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
+    this.logger.debug(`handling ${We} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
   handleBoardUnlinkEvent(e) {
     this.logger.debug(
-      `handling ${We} event ${e}`
+      `handling ${Qe} event ${e}`
     ), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
 };
 Ie([
   _
-], x.prototype, "models", 2);
+], B.prototype, "models", 2);
 Ie([
-  te({
+  re({
     lifecycle: pe.INIT,
-    topic: qe,
+    topic: We,
     websocket: !0
   })
-], x.prototype, "handleBoardLinkEvent", 1);
+], B.prototype, "handleBoardLinkEvent", 1);
 Ie([
-  te({
+  re({
     lifecycle: pe.INIT,
-    topic: We,
+    topic: Qe,
     websocket: !0
   })
-], x.prototype, "handleBoardUnlinkEvent", 1);
-x = Ie([
-  P(K)
-], x);
-const ar = async (e) => {
-  const t = e.data.boardPath, { model: r } = z(t);
+], B.prototype, "handleBoardUnlinkEvent", 1);
+B = Ie([
+  y(k)
+], B);
+const sr = async (e) => {
+  const t = e.data.boardPath, { model: r } = x(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var sr = Object.defineProperty, nr = Object.getOwnPropertyDescriptor, Qe = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? nr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && sr(t, r, a), a;
+var nr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, et = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? or(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && nr(t, r, i), i;
 };
-const k = S.PumpContainer;
-var et = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(et || {});
+const Y = L.PumpContainer;
+var tt = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(tt || {});
 let de = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "pumps");
-    this.id = e, this.pumps = new D({
+    this.id = e, this.pumps = new T({
       indexMap: {
         byNozzle: (r) => r.nozzlePaths,
         byBoard: (r) => r.boardPath,
         byType: "type"
       },
       parentId: e,
-      extensionId: h.PumpIndex
+      extensionId: g.PumpIndex
     });
   }
   /**
@@ -606,67 +606,67 @@ let de = class {
   }
   // -------------------ENTITY----------------------------
 };
-Qe([
+et([
   _
 ], de.prototype, "pumps", 2);
-de = Qe([
-  P(k)
+de = et([
+  y(Y)
 ], de);
 const Re = {
   registration: {
-    [k]: {
+    [Y]: {
       class: de,
       singleton: !0
     }
   },
-  type: k,
-  predicate: b(k),
+  type: Y,
+  predicate: b(Y),
   factory: v.Singleton.create(
-    k
+    Y
   )
-}, tt = async (e) => {
-  const t = [], { model: r } = await Be(e);
+}, rt = async (e) => {
+  const t = [], { model: r } = await Ge(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, or = async (e) => {
+}, dr = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
-  const i = await tt(r);
-  return [...t, ...i];
-}, dr = async (e) => {
+  const a = await rt(r);
+  return [...t, ...a];
+}, lr = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
-  const i = await Be(
+  const a = await Ge(
     Re.type
   );
-  if (i != null && i.model) {
-    const s = i.model.models.getIndexByKey(
-      et.byBoard,
+  if (a != null && a.model) {
+    const s = a.model.models.getIndexByKey(
+      tt.byBoard,
       r
     ).map(
-      (c) => tt(c.path)
+      (l) => rt(l.path)
     );
-    (await Promise.allSettled(s)).forEach((c) => {
-      c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
+    (await Promise.allSettled(s)).forEach((l) => {
+      l.status === "fulfilled" && l.value.forEach((c) => t.push(c));
     });
   }
   return Array.from(new Set(t));
 };
-var lr = Object.getOwnPropertyDescriptor, cr = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? lr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = n(a) || a);
-  return a;
+var cr = Object.getOwnPropertyDescriptor, pr = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? cr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = n(i) || i);
+  return i;
 };
-const Y = "board-model", Ae = (e, t) => {
-  const { type: r, name: i, path: a, linked: s, instanceId: n, link: c, ...l } = e;
-  t.type = r, t.name = i, t.path = a, t.linked = s, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
+const Z = "board-model", Ae = (e, t) => {
+  const { type: r, name: a, path: i, linked: s, instanceId: n, link: l, ...c } = e;
+  t.type = r, t.name = a, t.path = i, t.linked = s, t.link = Object.freeze(l), t.instanceId = n, Object.assign(t, c);
 };
-g[Me].register(
+P[Me].register(
   "board",
-  dr
+  lr
 );
-g[ee].register(
+P[te].register(
   "board",
-  ar
+  sr
 );
 let Oe = class {
   constructor(e, t, r) {
@@ -690,78 +690,78 @@ let Oe = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-Oe = cr([
-  P(Y)
+Oe = pr([
+  y(Z)
 ], Oe);
-const rt = {
+const at = {
   registration: {
-    [Y]: {
+    [Z]: {
       class: Oe,
       singleton: !1
     }
   },
-  type: Y,
-  predicate: b(Y),
-  factory: v.Factory.create(Y)
+  type: Z,
+  predicate: b(Z),
+  factory: v.Factory.create(Z)
 }, it = {
   registration: {
-    [K]: {
-      class: x,
+    [k]: {
+      class: B,
       singleton: !0
     },
-    ...rt.registration
+    ...at.registration
   },
-  type: K,
-  predicate: b(K),
+  type: k,
+  predicate: b(k),
   factory: v.Singleton.create(
-    K
+    k
   )
 };
-var pr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, me = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? hr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && pr(t, r, a), a;
+var hr = Object.defineProperty, gr = Object.getOwnPropertyDescriptor, me = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? gr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && hr(t, r, i), i;
 };
-const Z = S.HolderContainer, gr = "/kos/insertion/insert/start", ur = "/kos/insertion/insert/complete", Pr = "/kos/insertion/insert/update", yr = "/kos/insertion/remove", Ir = "/kos/pumpEvent/replaceLine", mr = "/kos/handle/*";
-let B = class {
+const X = L.HolderContainer, ur = "/kos/insertion/insert/start", Pr = "/kos/insertion/insert/complete", yr = "/kos/insertion/insert/update", Ir = "/kos/insertion/remove", mr = "/kos/pumpEvent/replaceLine", fr = "/kos/handle/*";
+let G = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "holders");
     o(this, "logger");
-    this.id = e, this.holders = new D({
+    this.id = e, this.holders = new T({
       indexMap: {
-        nozzle: (i) => i.nozzlePaths,
+        nozzle: (a) => a.nozzlePaths,
         group: "group"
       },
       parentId: e,
-      extensionId: h.HolderIndex
+      extensionId: g.HolderIndex
     }), this.logger = r.logger;
   }
   updateModel() {
   }
   handleHolderEvents(e) {
-    var r, i, a;
+    var r, a, i;
     m.ifDebug(
       () => this.logger.debug("Received holder change event", JSON.stringify(e))
     );
     const t = this.holders.getModel(e.path);
     t && (this.logger.info(
       `Received change event for holder ${t.path}.  Updating fuel gauge data.`
-    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (i = e.slice) == null ? void 0 : i.maxVolMl, (a = e == null ? void 0 : e.container) != null && a.enjoyByDate ? t.enjoyByDate = new Date(e.container.enjoyByDate) : t.enjoyByDate = void 0);
+    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (a = e.slice) == null ? void 0 : a.maxVolMl, (i = e == null ? void 0 : e.container) != null && i.enjoyByDate ? t.enjoyByDate = new Date(e.container.enjoyByDate) : t.enjoyByDate = void 0);
   }
   handleInsertion(e) {
     m.ifDebug(
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
       O(() => {
-        var s, n, c;
-        const i = r.ingredientId, a = this.holders.getModel(r.path);
-        a && (this.logger.info(
-          `Received insertion event for holder ${a.path}`
-        ), a.updateIngredient(i), a.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, a.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (c = r == null ? void 0 : r.container) != null && c.enjoyByDate ? a.enjoyByDate = new Date(r.container.enjoyByDate) : a.enjoyByDate = void 0, r.pumps.forEach((l) => {
+        var s, n, l;
+        const a = r.ingredientId, i = this.holders.getModel(r.path);
+        i && (this.logger.info(
+          `Received insertion event for holder ${i.path}`
+        ), i.updateIngredient(a), i.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, i.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (l = r == null ? void 0 : r.container) != null && l.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((c) => {
           O(() => {
-            const p = a.pumps.getModel(l.path);
-            p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
+            const p = i.pumps.getModel(c.path);
+            p && (p.ingredientId = c.ingredientId, p.inserted = c.inserted, p.prevIngredientId = c.prevIngredientId);
           });
         }));
       });
@@ -771,88 +771,88 @@ let B = class {
 };
 me([
   _
-], B.prototype, "holders", 2);
+], G.prototype, "holders", 2);
 me([
-  te({
-    topic: mr,
+  re({
+    topic: fr,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
-], B.prototype, "handleHolderEvents", 1);
+], G.prototype, "handleHolderEvents", 1);
 me([
-  te({
+  re({
     topic: [
-      gr,
       ur,
       Pr,
       yr,
-      Ir
+      Ir,
+      mr
     ],
     websocket: !0
   })
-], B.prototype, "handleInsertion", 1);
-B = me([
-  P(Z)
-], B);
-const at = {
+], G.prototype, "handleInsertion", 1);
+G = me([
+  y(X)
+], G);
+const st = {
   registration: {
-    [Z]: {
-      class: B,
+    [X]: {
+      class: G,
       singleton: !0
     }
   },
-  type: Z,
-  predicate: b(Z),
+  type: X,
+  predicate: b(X),
   factory: v.Singleton.create(
-    Z
+    X
   )
-}, fr = m.createLogger({ name: "board-utils" }), vr = async (e) => {
-  const t = await A.executeDataMapperExtension({
-    extension: h.BoardMapper,
+}, vr = m.createLogger({ name: "board-utils" }), br = async (e) => {
+  const t = await U.executeDataMapperExtension({
+    extension: g.BoardMapper,
     data: e,
     contextData: {}
-  }), { type: r, name: i, path: a, linked: s, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
+  }), { type: r, name: a, path: i, linked: s, instanceId: n, ...l } = e, c = { ...l, ...t }, p = {
     type: r,
-    name: i,
-    path: a,
+    name: a,
+    path: i,
     linked: s,
     instanceId: n,
-    ...l
-  }, u = rt.factory(e.path)(p);
+    ...c
+  }, u = at.factory(e.path)(p);
   return u.updateModel(p), u;
-}, br = (e) => async (t) => {
-  fr.debug(`adding board ${t.name}`);
-  const r = await vr(t);
+}, Or = (e) => async (t) => {
+  vr.debug(`adding board ${t.name}`);
+  const r = await br(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))(d || {});
-const { URL: Ce } = N("PUMP_SERVICE"), { postModel: Or, getOne: _r } = $.build({
+const { URL: Ce } = D("PUMP_SERVICE"), { postModel: _r, getOne: Er } = S.build({
   basePath: `${Ce}/api/kos/holders`
 });
 m.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const Er = async ({
+const Mr = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const i = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, a = await Or({ model: {}, urlOverride: i, tracker: r });
-  return a != null && a.data && he.initiateFuture(a.data), a;
-}, Mr = async (e, t) => {
-  const r = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, i = await _r({ urlOverride: r });
-  return i != null && i.data ? i.data : { volume: -1 };
+  const a = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await _r({ model: {}, urlOverride: a, tracker: r });
+  return i != null && i.data && he.initiateFuture(i.data), i;
+}, wr = async (e, t) => {
+  const r = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await Er({ urlOverride: r });
+  return a != null && a.data ? a.data : { volume: -1 };
 };
-var wr = Object.defineProperty, Rr = Object.getOwnPropertyDescriptor, st = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? Rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && wr(t, r, a), a;
+var Rr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, nt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Cr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Rr(t, r, i), i;
 };
-const X = S.Pump;
-g[Me].register(
+const J = L.Pump;
+P[Me].register(
   "pump",
-  or
+  dr
 );
 let le = class {
   constructor(e, t) {
@@ -868,35 +868,37 @@ let le = class {
     o(this, "name");
     o(this, "path");
     o(this, "prevIngredientId");
+    o(this, "state");
     o(this, "futureHandler");
     o(this, "currentState", d.IDLE);
     this.id = e;
     const {
       inserted: r,
-      holderPath: i,
-      boardPath: a,
+      holderPath: a,
+      boardPath: i,
       nozzlePath: s,
       name: n,
-      path: c,
-      childPump: l,
+      path: l,
+      childPump: c,
       virtual: p,
       prevIngredientId: u,
-      ...j
+      state: F,
+      ...h
     } = t;
-    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = i, this.boardPath = a, this.nozzlePath = s, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = u, Object.assign(this, j), this.futureHandler = new Ge(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = a, this.boardPath = i, this.nozzlePath = s, this.name = n, this.path = l, this.childPump = !!c, this.virtual = !!p, this.prevIngredientId = u, this.state = F, Object.assign(this, h), this.futureHandler = new je(this);
   }
   updateModel(e) {
     const {
       inserted: t,
       holderPath: r,
-      boardPath: i,
-      nozzlePath: a,
+      boardPath: a,
+      nozzlePath: i,
       childPump: s,
       name: n,
-      path: c,
-      ...l
+      path: l,
+      ...c
     } = e;
-    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = i, this.nozzlePath = a, this.childPump = this.childPump ? this.childPump : !!s, this.name = n, 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 = a, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!s, this.name = n, this.path = l, this.prevIngredientId = e.prevIngredientId, Object.assign(this, c);
   }
   // -------------------LIFECYCLE----------------------------
   get pouringState() {
@@ -925,7 +927,7 @@ let le = class {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await Mr(this.path, e);
+    return await wr(this.path, e);
   }
   async performIntent(e, t) {
     const r = typeof e == "string" ? e : e.intent;
@@ -935,40 +937,40 @@ let le = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const i = await Er({
+        const a = await Mr({
           tracker: t,
           intent: r,
           pumpId: this.path
         });
         return this.currentState === d.POUR_STARTING && O(() => {
           this.currentState = d.POURING;
-        }), i == null ? void 0 : i.data;
+        }), a == null ? void 0 : a.data;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (i) {
-      throw m.error(i), this.currentState = d.IDLE, i;
+    } catch (a) {
+      throw m.error(a), this.currentState = d.IDLE, a;
     }
   }
   // -------------------ENTITY----------------------------
 };
-st([
+nt([
   ge()
 ], le.prototype, "performIntent", 1);
-le = st([
-  P(X)
+le = nt([
+  y(J)
 ], le);
-const nt = {
+const ot = {
   registration: {
-    [X]: {
+    [J]: {
       class: le,
       singleton: !1
     }
   },
-  type: X,
-  predicate: b(X),
-  factory: v.Factory.create(X)
-}, Cr = m.createLogger({ name: "pump-utils" }), Nr = (e, t) => {
-  const r = (t.pumps ?? []).length > 1, i = {
+  type: J,
+  predicate: b(J),
+  factory: v.Factory.create(J)
+}, Ue = m.createLogger({ name: "pump-utils" }), $r = (e, t) => {
+  const r = (t.pumps ?? []).length > 1, a = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
     ingredientId: t.ingredientId,
@@ -979,32 +981,37 @@ const nt = {
     path: t.path,
     type: t.type,
     nozzlePath: e,
-    prevIngredientId: t.prevIngredientId
-  }, a = nt.factory(t.path)(i);
-  return a.updateModel(i), a;
-}, ot = (e) => (t) => (r) => (i) => {
-  var c;
-  Cr.debug(`adding pump ${i.name}`);
-  const a = Nr(r.path, i);
-  e.addModel(a);
-  const s = a.holderPath, n = t.holders.getModel(s);
-  n == null || n.pumps.addModel(a), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (c = i == null ? void 0 : i.pumps) == null || c.forEach((l) => {
-    const p = a.holderPath, u = {
-      ...l,
-      childPump: !0,
-      holderPath: p,
-      ingredientId: a.ingredientId
-    };
-    ot(e)(t)(r)(u);
-  });
+    prevIngredientId: t.prevIngredientId,
+    state: t.state
+  }, i = ot.factory(t.path)(a);
+  return i.updateModel(a), i;
+}, dt = (e) => (t) => (r) => (a) => {
+  var i;
+  try {
+    Ue.debug(`adding pump ${a.name}`);
+    const s = $r(r.path, a);
+    e.addModel(s);
+    const n = s.holderPath, l = t.holders.getModel(n);
+    l == null || l.pumps.addModel(s), l != null && l.nozzlePaths.includes(r.path) || l == null || l.nozzlePaths.push(r.path), (i = a == null ? void 0 : a.pumps) == null || i.forEach((c) => {
+      const p = s.holderPath, u = {
+        ...c,
+        childPump: !0,
+        holderPath: p,
+        ingredientId: s.ingredientId
+      };
+      dt(e)(t)(r)(u);
+    });
+  } catch (s) {
+    throw Ue.error(`Error mapping assembly pump: ${s}`), s;
+  }
 };
-var $r = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, ie = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? Dr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && $r(t, r, a), a;
+var Nr = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, ie = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Dr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Nr(t, r, i), i;
 };
-const J = "assembly-model", Sr = "assembly-data", Tr = "assembly-raw-data";
-let C = class {
+const q = "assembly-model", Sr = "assembly-data", Tr = "assembly-raw-data";
+let N = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "_nozzlePaths", /* @__PURE__ */ new Set());
@@ -1013,7 +1020,7 @@ let C = class {
     o(this, "boardContainer");
     o(this, "pumpContainer");
     o(this, "logger");
-    this.id = e, this.holderContainer = at.factory({}), this.boardContainer = it.factory({}), this.pumpContainer = Re.factory({}), this.logger = r.logger;
+    this.id = e, this.holderContainer = st.factory({}), this.boardContainer = it.factory({}), this.pumpContainer = Re.factory({}), this.logger = r.logger;
   }
   updateModel(e) {
   }
@@ -1056,92 +1063,96 @@ let C = class {
   }
   async ready() {
     var e;
-    (e = this.troubleContainer) == null || e.troubles.increment(), g[It].execute(
-      h.AssemblyFeatureFlags,
+    (e = this.troubleContainer) == null || e.troubles.increment(), P[mt].execute(
+      g.AssemblyFeatureFlags,
       this
     );
   }
   async load(e) {
     this.logger.debug(`loading assembly ${this.id}`);
-    const t = await Je();
+    const t = await qe();
     if ((t == null ? void 0 : t.status) === 200) {
-      const r = await A.executeDataMapperExtension({
-        extension: h.AssemblyMapper,
+      const r = await U.executeDataMapperExtension({
+        extension: g.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([i, a]) => {
-        mt(a) && (this.logger.debug(`adding child model ${i} from extension data`), this[ft][i] = !0);
+      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
+        ft(i) && (this.logger.debug(`adding child model ${a} from extension data`), this[vt][a] = !0);
       }), e.set(Tr, t.data);
-      for await (const i of t.data.assemblies) {
+      for await (const a of t.data.assemblies) {
         const {
-          boards: a = [],
+          boards: i = [],
           holders: s = {},
           nozzles: n = [],
-          core: c,
-          name: l,
+          core: l,
+          name: c,
           path: p,
           ...u
-        } = i;
-        this.logger.debug(`adding assembly ${l}`), Object.keys(u).forEach((y) => {
-          vt.enableFeature(y);
+        } = a;
+        this.logger.debug(`adding assembly ${c}`), this.logger.warn(`Assembly rest keys: ${Object.keys(u).join(", ")}`), Object.keys(u).forEach((h) => {
+          var M;
+          if (this.logger.warn(`Enabling feature flag: ${h}`), bt.enableFeature(h), e.set(`assembly-feature-${h}`, u[h]), ((M = u[h].state) == null ? void 0 : M.path) !== void 0) {
+            const C = u[h].state.path;
+            this.logger.warn(`Feature flag ${h} state path: ${C}`), e.set(`assembly-state-path-${h}`, C);
+          }
         });
-        for await (const y of a)
-          this.logger.debug(`adding board ${y.name}`), await br(this.boardContainer)(y);
-        for await (const [y, L] of Object.entries(
+        for await (const h of i)
+          this.logger.debug(`adding board ${h.name}`), await Or(this.boardContainer)(h);
+        for await (const [h, M] of Object.entries(
           s ?? {}
         ))
-          for await (const ae of L) {
-            this.logger.debug(`adding holder ${ae.name}`);
-            const De = await Wt(y, ae);
+          for await (const C of M) {
+            this.logger.debug(`adding holder ${C.name}`);
+            const De = await Qt(h, C);
             this.holderContainer.holders.addModel(De);
           }
-        const j = ot(this.pumpContainer)(
+        const F = dt(this.pumpContainer)(
           this.holderContainer
         );
-        n.forEach((y) => {
-          this._nozzlePaths.add(y.path);
-          const L = j(y);
-          y.pumps.forEach(L);
+        n.forEach((h) => {
+          this._nozzlePaths.add(h.path);
+          const M = F(h);
+          h.pumps.forEach(M);
         });
       }
     }
   }
 };
 ie([
-  xe({
+  Be({
     modelType: "trouble-container-model"
   })
-], C.prototype, "troubleContainer", 2);
+], N.prototype, "troubleContainer", 2);
 ie([
   _
-], C.prototype, "holderContainer", 2);
+], N.prototype, "holderContainer", 2);
 ie([
   _
-], C.prototype, "boardContainer", 2);
+], N.prototype, "boardContainer", 2);
 ie([
   _
-], C.prototype, "pumpContainer", 2);
-C = ie([
-  P(J)
-], C);
-const dt = {
+], N.prototype, "pumpContainer", 2);
+N = ie([
+  y(q)
+], N);
+const lt = {
   registration: {
-    [J]: {
-      class: C,
+    [q]: {
+      class: N,
       singleton: !0
     }
   },
-  type: J,
-  predicate: b(J),
-  factory: v.Singleton.create(J)
+  type: q,
+  predicate: b(q),
+  factory: v.Singleton.create(q)
 };
-var Lr = Object.getOwnPropertyDescriptor, Ar = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? Lr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = n(a) || a);
-  return a;
+var Lr = Object.getOwnPropertyDescriptor, Ar = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Lr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = n(i) || i);
+  return i;
 };
-const q = S.Availability;
+const W = L.Availability;
 let _e = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1169,56 +1180,56 @@ let _e = class {
   // -------------------ENTITY----------------------------
 };
 _e = Ar([
-  bt(),
-  P(q)
+  Ot(),
+  y(W)
 ], _e);
 const Ee = {
   registration: {
-    [q]: {
+    [W]: {
       class: _e,
       singleton: !1
     }
   },
-  type: q,
-  predicate: b(q),
+  type: W,
+  predicate: b(W),
   factory: v.Factory.create(
-    q
+    W
   )
-}, { URL: G } = N("NOZZLE_SERVICE"), { postModel: Ne, deleteModel: Ur, getOne: zr } = $.build({
-  basePath: `${G}/api/nozzle`
+}, { URL: j } = D("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Ur, getOne: zr } = S.build({
+  basePath: `${j}/api/nozzle`
 }), xr = async (e, t) => {
-  const r = await Ne({
+  const r = await $e({
     model: {},
-    urlOverride: `${G}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
+    urlOverride: `${j}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
     ordered: !0,
     tracker: t
   });
   return r != null && r.data && he.initiateFuture(r.data), r;
 }, Br = async (e, t, r) => {
-  const i = await Ne({
+  const a = await $e({
     model: {},
-    urlOverride: `${G}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
+    urlOverride: `${j}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
     ordered: !0,
     tracker: r
   });
-  return i != null && i.data && he.initiateFuture(i.data), i;
+  return a != null && a.data && he.initiateFuture(a.data), a;
 }, Gr = async (e) => await zr({
-  urlOverride: `${G}${e}/pipeline/beverage/availability`
-}), jr = async (e, t) => await Ne({
+  urlOverride: `${j}${e}/pipeline/beverage/availability`
+}), jr = async (e, t) => await $e({
   model: t,
-  urlOverride: `${G}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+  urlOverride: `${j}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 }), Fr = async (e) => await Ur({
   id: e,
-  urlOverride: `${G}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+  urlOverride: `${j}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
-var Hr = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, E = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? Vr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && Hr(t, r, a), a;
+var Hr = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, E = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Vr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Hr(t, r, i), i;
 };
-const W = S.Nozzle, Kr = Ot(
+const Q = L.Nozzle, Kr = _t(
   "beverageTopicPrefix"
-), fe = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Ue = "/kos/nozzle/pour/started", kr = "/kos/nozzle/pour/progress", Yr = "/kos/nozzle/pour/cancel";
+), fe = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, ze = "/kos/nozzle/pour/started", kr = "/kos/nozzle/pour/progress", Yr = "/kos/nozzle/pour/cancel";
 let I = class {
   constructor(e, t) {
     /** the unique identifier for this nozzle.*/
@@ -1233,7 +1244,7 @@ let I = 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 _t(this), this._availabilityItems = new D({
+    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 Et(this), this._availabilityItems = new T({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
@@ -1325,32 +1336,32 @@ let I = class {
     context: r
   }) {
     if (!e) {
-      const c = await Fr(this.name);
-      if ((c == null ? void 0 : c.status) !== 200)
+      const l = await Fr(this.name);
+      if ((l == null ? void 0 : l.status) !== 200)
         throw new Error("Failed to clear pourable");
       this._selectedBeverage = void 0;
       return;
     }
-    if (e === this._selectedBeverage && Et(this._additionalItems, t)) {
+    if (e === this._selectedBeverage && Mt(this._additionalItems, t)) {
       this.logger.info("No change in selected pourable");
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let i = await g.dataMapper.executeMapper(
-      h.SelectedPourableMapper,
+    let a = await P.dataMapper.executeMapper(
+      g.SelectedPourableMapper,
       {
         beverage: e,
         additional: t,
         context: r
       }
     );
-    const a = {
+    const i = {
       bevId: e.rawId
     };
-    (!i || Object.keys(i).length === 0) && (this.logger.info(
-      `No selected pourable mapper defined, using the default payload ${a}`
-    ), i = a);
-    const s = i ?? a, n = await jr(this.name, s);
+    (!a || Object.keys(a).length === 0) && (this.logger.info(
+      `No selected pourable mapper defined, using the default payload ${i}`
+    ), a = i);
+    const s = a ?? i, n = await jr(this.name, s);
     if ((n == null ? void 0 : n.status) !== 200)
       throw new Error("Failed to select pourable");
   }
@@ -1385,7 +1396,7 @@ let I = class {
     );
   }
   handlePouringStart() {
-    this.logger.info("Pour started"), U(this).forEach((e) => {
+    this.logger.info("Pour started"), z(this).forEach((e) => {
       var t;
       fe(e) && ((t = e.onPourStart) == null || t.call(e));
     });
@@ -1397,21 +1408,21 @@ let I = class {
     this.logger.info("Pour canceling");
   }
   handleCanceled() {
-    this.logger.info("Pour canceled"), U(this).forEach((t) => {
+    this.logger.info("Pour canceled"), z(this).forEach((t) => {
       var r;
       fe(t) && ((r = t.onPourCancel) == null || r.call(t));
     });
     const e = {
       nozzleId: this.id
     };
-    R.publish(Yr, e);
+    $.publish(Yr, e);
   }
   // ============================================================================
   // Future Lifecycle Handler
   // ============================================================================
   onFutureUpdate(e) {
-    U(this).forEach((i) => {
-      fe(i) && i.onPourProgress(e);
+    z(this).forEach((a) => {
+      fe(a) && a.onPourProgress(e);
     });
     const r = {
       nozzleId: this.id,
@@ -1424,7 +1435,7 @@ let I = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    R.publish(kr, r), e.endState && O(() => {
+    $.publish(kr, r), e.endState && O(() => {
       this.currentState === d.POURING && this.transition("POUR_COMPLETED");
     });
   }
@@ -1436,11 +1447,11 @@ let I = class {
         throw new Error("No tracker provided");
       const r = await xr(this.name, e);
       this.transition("POUR_ACTIVE");
-      const i = {
+      const a = {
         nozzleId: this.id,
         type: "free"
       };
-      return R.publish(Ue, i), (t = r == null ? void 0 : r.data) != null && t.endState && this.transition("POUR_COMPLETED"), r;
+      return $.publish(ze, a), (t = r == null ? void 0 : r.data) != null && t.endState && this.transition("POUR_COMPLETED"), r;
     } catch (r) {
       throw this.logger.error(r), this.currentState !== d.IDLE && this.transition("POUR_COMPLETED"), r;
     }
@@ -1451,15 +1462,15 @@ let I = class {
     try {
       if (this.transition("START_POUR"), !t)
         throw new Error("No tracker provided");
-      const i = await Br(e, this.name, t);
+      const a = await Br(e, this.name, t);
       this.transition("POUR_ACTIVE");
-      const a = {
+      const i = {
         nozzleId: this.id,
         type: "fixed"
       };
-      return R.publish(Ue, a), (r = i == null ? void 0 : i.data) != null && r.endState && this.transition("POUR_COMPLETED"), i;
-    } catch (i) {
-      throw this.logger.error(i), this.currentState !== d.IDLE && this.transition("POUR_COMPLETED"), i;
+      return $.publish(ze, i), (r = a == null ? void 0 : a.data) != null && r.endState && this.transition("POUR_COMPLETED"), a;
+    } catch (a) {
+      throw this.logger.error(a), this.currentState !== d.IDLE && this.transition("POUR_COMPLETED"), a;
     }
   }
   // Inherits throwOnInvalid: false - silently ignore if already idle
@@ -1470,105 +1481,105 @@ let I = class {
   updateGroupMembers() {
     this._availabilityItems.data.forEach((e) => {
       (e.taggedIds || []).forEach((r) => {
-        const i = this._availabilityItems.data.find(
-          (a) => a.rawId === r
+        const a = this._availabilityItems.data.find(
+          (i) => i.rawId === r
         );
-        i && i.parentId !== e.id && (i.parentId = e.id, this._availabilityItems.updateModel(i));
+        a && a.parentId !== e.id && (a.parentId = e.id, this._availabilityItems.updateModel(a));
       });
     });
   }
   /** @internal */
   async load(e) {
-    var i, a;
+    var a, i;
     this.logger.debug(`loading nozzle ${this.id}`);
     const t = await Gr(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
-    const r = await g.loader.executeLoader(
-      h.AvailabilityLoader,
+    const r = await P.loader.executeLoader(
+      g.AvailabilityLoader,
       {}
     );
-    e == null || e.set(h.AvailabilityLoader, r), e == null || e.set($e.type, this);
-    for (const s of Object.keys((i = t.data) == null ? void 0 : i.groups) || [])
-      for (const n of ((a = t.data) == null ? void 0 : a.groups[s]) || []) {
-        const c = await g.dataMapper.executeMapper(
-          h.AvailabilityMapper,
+    e == null || e.set(g.AvailabilityLoader, r), e == null || e.set(Ne.type, this);
+    for (const s of Object.keys((a = t.data) == null ? void 0 : a.groups) || [])
+      for (const n of ((i = t.data) == null ? void 0 : i.groups[s]) || []) {
+        const l = await P.dataMapper.executeMapper(
+          g.AvailabilityMapper,
           { ...n, groupId: s },
           r
-        ), l = {
+        ), c = {
           ...n,
           note: n.note ?? void 0,
           kosParentId: this.id,
           rawId: n.id,
           groupId: s,
-          data: c,
+          data: l,
           properties: n.properties || {}
         }, p = Ee.factory(
           `${this.id}-${s}-${n.id}`
-        )(l);
+        )(c);
         this._availabilityItems.addModel(p);
       }
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = Mt.getContext(this.id), r = (t == null ? void 0 : t.get(h.AvailabilityLoader)) || {};
+    const t = wt.getContext(this.id), r = (t == null ? void 0 : t.get(g.AvailabilityLoader)) || {};
     if (e.rebuild)
-      for (const i of Object.keys(e == null ? void 0 : e.groups) || []) {
-        this._availabilityItems.getIndexByKey("group", i).filter(
-          (s) => !e.groups[i].find(
-            (n) => `${this.id}-${i}-${n.id}` === s.id
+      for (const a of Object.keys(e == null ? void 0 : e.groups) || []) {
+        this._availabilityItems.getIndexByKey("group", a).filter(
+          (s) => !e.groups[a].find(
+            (n) => `${this.id}-${a}-${n.id}` === s.id
           )
         ).forEach((s) => {
-          this._availabilityItems.removeModel(s.id), wt(s);
+          this._availabilityItems.removeModel(s.id), Rt(s);
         });
-        for (const s of (e == null ? void 0 : e.groups[i]) || []) {
-          const n = await g.dataMapper.executeMapper(
-            h.AvailabilityMapper,
-            { ...s, groupId: i },
+        for (const s of (e == null ? void 0 : e.groups[a]) || []) {
+          const n = await P.dataMapper.executeMapper(
+            g.AvailabilityMapper,
+            { ...s, groupId: a },
             r
-          ), c = {
+          ), l = {
             ...s,
             note: s.note ?? void 0,
             kosParentId: this.id,
-            groupId: i,
+            groupId: a,
             rawId: s.id,
             data: n,
             taggedIds: s.taggedIds,
             properties: s.properties || {}
-          }, l = this._availabilityItems.getModel(
-            `${this.id}-${i}-${s.id}`
+          }, c = this._availabilityItems.getModel(
+            `${this.id}-${a}-${s.id}`
           );
-          if (l)
-            l.updateModel(c);
+          if (c)
+            c.updateModel(l);
           else {
             const p = Ee.factory(
-              `${this.id}-${i}-${s.id}`
-            )(c);
+              `${this.id}-${a}-${s.id}`
+            )(l);
             this._availabilityItems.addModel(p);
           }
         }
       }
     else
-      for (const i of Object.keys(e == null ? void 0 : e.groups) || [])
-        for (const a of (e == null ? void 0 : e.groups[i]) || []) {
-          const s = await g.dataMapper.executeMapper(
-            h.AvailabilityMapper,
-            { ...a, groupId: i },
+      for (const a of Object.keys(e == null ? void 0 : e.groups) || [])
+        for (const i of (e == null ? void 0 : e.groups[a]) || []) {
+          const s = await P.dataMapper.executeMapper(
+            g.AvailabilityMapper,
+            { ...i, groupId: a },
             r
           ), n = {
-            ...a,
-            note: a.note ?? void 0,
+            ...i,
+            note: i.note ?? void 0,
             kosParentId: this.id,
-            groupId: i,
-            rawId: a.id,
+            groupId: a,
+            rawId: i.id,
             data: s,
-            type: a.type,
-            taggedIds: a.taggedIds,
-            properties: a.properties || {}
-          }, c = this._availabilityItems.getModel(
-            `${this.id}-${i}-${a.id}`
+            type: i.type,
+            taggedIds: i.taggedIds,
+            properties: i.properties || {}
+          }, l = this._availabilityItems.getModel(
+            `${this.id}-${a}-${i.id}`
           );
-          c && c.updateModel(n);
+          l && l.updateModel(n);
         }
     this.updateGroupMembers();
   }
@@ -1591,27 +1602,27 @@ E([
 ], I.prototype, "handleCanceled", 1);
 E([
   ge(),
-  re({ allowedStates: [d.IDLE] })
+  ae({ allowedStates: [d.IDLE] })
 ], I.prototype, "pour", 1);
 E([
   ge(),
-  re({ allowedStates: [d.IDLE] })
+  ae({ allowedStates: [d.IDLE] })
 ], I.prototype, "fixedPour", 1);
 E([
-  re({
+  ae({
     allowedStates: [d.POUR_STARTING, d.POURING]
   })
 ], I.prototype, "cancelPour", 1);
 E([
-  te({
+  re({
     topic: `${Kr}/availability`,
     websocket: !0
   })
 ], I.prototype, "updateAvailability", 1);
 I = E([
-  P(W),
-  je(),
-  Fe(
+  y(Q),
+  Fe(),
+  He(
     {
       initial: d.IDLE,
       initializeAt: pe.READY,
@@ -1648,29 +1659,29 @@ I = E([
     }
   )
 ], I);
-const $e = {
+const Ne = {
   registration: {
-    [W]: {
+    [Q]: {
       class: I,
       singleton: !1
     }
   },
-  type: W,
-  predicate: b(W),
-  factory: v.Factory.create(W)
+  type: Q,
+  predicate: b(Q),
+  factory: v.Factory.create(Q)
 };
-var Zr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, lt = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? Xr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && Zr(t, r, a), a;
+var Zr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, ct = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Xr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Zr(t, r, i), i;
 };
-const ct = "device-assembly-model";
+const pt = "device-assembly-model";
 let ce = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "deviceNozzles");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, this.deviceNozzles = new D();
+    this.id = e, this.logger = r.logger, this.deviceNozzles = new T();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1684,54 +1695,54 @@ let ce = class {
   }
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
-    const e = await Je();
+    const e = await qe();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles ?? []).flat().forEach((r) => {
       var n;
-      const i = r.path, a = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = $e.factory(i)({
+      const a = r.path, i = ((n = r.pipelines.find((l) => l.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = Ne.factory(a)({
         path: r.path,
         name: r.name,
         urlPrefix: r.urlPrefix,
         topicPrefix: r.topicPrefix,
-        beverageTopicPrefix: a
+        beverageTopicPrefix: i
       });
       this.deviceNozzles.addModel(s);
     });
   }
 };
-lt([
+ct([
   _
 ], ce.prototype, "deviceNozzles", 2);
-ce = lt([
-  P(ct)
+ce = ct([
+  y(pt)
 ], ce);
-const Jr = new Rt({
+const Jr = new Ct({
   class: ce,
-  type: ct
-}), { URL: pt } = N("GENERIC_POUR_SERVICE"), { postModel: qr } = $.build({
-  basePath: `${pt}/api/nozzle`
+  type: pt
+}), { URL: ht } = D("GENERIC_POUR_SERVICE"), { postModel: qr } = S.build({
+  basePath: `${ht}/api/nozzle`
 }), Wr = async (e, t) => {
   const r = await qr({
     model: {},
-    urlOverride: `${pt}${e}`,
+    urlOverride: `${ht}${e}`,
     ordered: !0,
     tracker: t
   });
   return r != null && r.data && he.initiateFuture(r.data), r;
 };
-var Qr = Object.defineProperty, ei = Object.getOwnPropertyDescriptor, T = (e, t, r, i) => {
-  for (var a = i > 1 ? void 0 : i ? ei(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
-  return i && a && Qr(t, r, a), a;
+var Qr = Object.defineProperty, ea = Object.getOwnPropertyDescriptor, A = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? ea(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Qr(t, r, i), i;
 };
-const ht = "generic-pour-model", ti = "/kos/generic/pour/started", ri = "/kos/generic/pour/progress", ii = "/kos/generic/pour/cancel", ve = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
-let M = class {
+const gt = "generic-pour-model", ta = "/kos/generic/pour/started", ra = "/kos/generic/pour/progress", aa = "/kos/generic/pour/cancel", ve = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+let w = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "servicePathFactory");
     o(this, "pourType");
     o(this, "selectedId");
     o(this, "state");
-    this.id = e, this.futureHandler = new Ge(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId, this.state = Te();
+    this.id = e, this.futureHandler = new je(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId, this.state = Te();
   }
   get servicePath() {
     return this.selectedId ? this.servicePathFactory(this.selectedId, this.state) : "";
@@ -1746,7 +1757,7 @@ let M = class {
     this.state = Te();
   }
   handlePouringStart() {
-    this.logger.info("Pour started"), U(this).forEach((t) => {
+    this.logger.info("Pour started"), z(this).forEach((t) => {
       var r;
       ve(t) && ((r = t.onPourStart) == null || r.call(t));
     });
@@ -1754,7 +1765,7 @@ let M = class {
       pourTarget: this.id,
       type: this.pourType
     };
-    R.publish(ti, e);
+    $.publish(ta, e);
   }
   handlePouringEnd() {
     this.logger.info("Pour ended");
@@ -1763,14 +1774,14 @@ let M = class {
     this.logger.info("Pour canceling");
   }
   handleCanceled() {
-    this.logger.info("Pour canceled"), U(this).forEach((t) => {
+    this.logger.info("Pour canceled"), z(this).forEach((t) => {
       var r;
       ve(t) && ((r = t.onPourCancel) == null || r.call(t));
     });
     const e = {
       pourTarget: this.id
     };
-    R.publish(ii, e);
+    $.publish(aa, e);
   }
   // Inherits throwOnInvalid: false from class
   async pour(e) {
@@ -1819,7 +1830,7 @@ let M = class {
   // Future Lifecycle Handler
   // ============================================================================
   onFutureUpdate(e) {
-    U(this).forEach((r) => {
+    z(this).forEach((r) => {
       ve(r) && r.onPourProgress(e);
     });
     const t = {
@@ -1833,37 +1844,37 @@ let M = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    R.publish(ri, t), e.endState && O(() => {
+    $.publish(ra, t), e.endState && O(() => {
       this.currentState === d.POURING && this.transition("POUR_COMPLETED");
     });
   }
 };
-T([
+A([
   ue(d.POURING)
-], M.prototype, "handlePouringStart", 1);
-T([
+], w.prototype, "handlePouringStart", 1);
+A([
   Pe(d.POURING)
-], M.prototype, "handlePouringEnd", 1);
-T([
+], w.prototype, "handlePouringEnd", 1);
+A([
   ue(d.POUR_CANCELING)
-], M.prototype, "handleCancelStart", 1);
-T([
+], w.prototype, "handleCancelStart", 1);
+A([
   Pe(d.POUR_CANCELING)
-], M.prototype, "handleCanceled", 1);
-T([
+], w.prototype, "handleCanceled", 1);
+A([
   ge(),
-  re({ allowedStates: [d.IDLE] })
-], M.prototype, "pour", 1);
-T([
-  re({
+  ae({ allowedStates: [d.IDLE] })
+], w.prototype, "pour", 1);
+A([
+  ae({
     allowedStates: [d.POUR_STARTING, d.POURING]
   })
-], M.prototype, "cancelPour", 1);
-M = T([
-  P(ht),
-  je(),
-  Ct(),
-  Fe(
+], w.prototype, "cancelPour", 1);
+w = A([
+  y(gt),
+  Fe(),
+  $t(),
+  He(
     {
       initial: d.IDLE,
       initializeAt: pe.READY,
@@ -1899,102 +1910,102 @@ M = T([
       // Gracefully ignore invalid state calls (expected runtime scenarios)
     }
   )
-], M);
-const hi = new Nt({
-  class: M,
-  type: ht
-}), ze = {
-  ...ke.registration,
-  ...He.registration,
-  ...at.registration,
-  ...Xe.registration,
-  ...$e.registration,
-  ...nt.registration,
+], w);
+const ha = new Nt({
+  class: w,
+  type: gt
+}), xe = {
+  ...Ye.registration,
+  ...Ve.registration,
+  ...st.registration,
+  ...Je.registration,
+  ...Ne.registration,
+  ...ot.registration,
   ...Re.registration,
   ...Ee.registration,
-  ...dt.registration,
+  ...lt.registration,
   ...it.registration
-}, ai = (e) => () => (Dt(e)(), Jr.register(), Object.keys(ze).forEach((t) => {
-  const r = ze[t];
-  St(e)(t, r);
-}), g[ee].register(
+}, ia = (e) => () => (St(e)(), Jr.register(), Object.keys(xe).forEach((t) => {
+  const r = xe[t];
+  Tt(e)(t, r);
+}), P[te].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
-      const { model: i } = z(
-        dt.type
+      const { model: a } = x(
+        lt.type
       );
-      if (i) {
-        const a = i.boards.find(
+      if (a) {
+        const i = a.boards.find(
           (s) => s.id === t.data.deviceId
-        ) ? z(t.data.deviceId).model : void 0;
+        ) ? x(t.data.deviceId).model : void 0;
         return {
-          devices: a ? a.name : ""
+          devices: i ? i.name : ""
         };
       }
     }
     return {};
   }
 ), {
-  preload: w.model.preloadModel(e),
-  model: w.model.register(e),
-  companion: w.companion.register(e),
-  legacy: w.model.registerLegacyModel(e)
+  preload: R.model.preloadModel(e),
+  model: R.model.register(e),
+  companion: R.companion.register(e),
+  legacy: R.model.registerLegacyModel(e)
 }), f = {
-  ...$t
+  ...Dt
 };
 f.dispense = {
-  models: ai(f)
+  models: ia(f)
 };
-f.preload = w.model.preloadModel(f);
-f.model = w.model.register(f);
-f.companion = w.companion.register(f);
-f.legacy = w.model.registerLegacyModel(f);
-const gi = f;
+f.preload = R.model.preloadModel(f);
+f.model = R.model.register(f);
+f.companion = R.companion.register(f);
+f.legacy = R.model.registerLegacyModel(f);
+const ga = f;
 export {
-  dt as A,
-  x as B,
+  lt as A,
+  B,
   Sr as C,
-  S as D,
-  h as E,
+  L as D,
+  g as E,
   Gr as F,
-  hi as G,
-  Xe as H,
-  He as I,
+  ha as G,
+  Je as H,
+  Ve as I,
   Br as J,
-  gi as K,
+  ga as K,
   xr as L,
   jr as M,
-  $e as N,
+  Ne as N,
   Wr as O,
-  nt as P,
-  qe as T,
+  ot as P,
+  We as T,
   Tr as a,
   Ee as b,
-  We as c,
+  Qe as c,
   it as d,
-  rt as e,
+  at as e,
   Jr as f,
-  at as g,
-  ke as h,
+  st as g,
+  Ye as h,
   Re as i,
-  et as j,
+  tt as j,
   d as k,
-  ze as l,
-  Ut as m,
-  ci as n,
-  Ht as o,
-  pi as p,
-  li as q,
-  ai as r,
-  di as s,
-  Kt as t,
-  Zt as u,
-  Vt as v,
-  Je as w,
-  Mr as x,
-  Er as y,
+  xe as l,
+  zt as m,
+  ca as n,
+  Vt as o,
+  pa as p,
+  la as q,
+  ia as r,
+  da as s,
+  kt as t,
+  Xt as u,
+  Kt as v,
+  qe as w,
+  wr as x,
+  Mr as y,
   Fr as z
 };
-//# sourceMappingURL=dispense-registration-manager-kSiG2s8S.js.map
+//# sourceMappingURL=dispense-registration-manager-DgMTZL-g.js.map