@kosdev-code/kos-dispense-sdk 0.1.0-dev.5840 → 0.1.0-next.719

package/{dispense-registration-manager-C7GGaZ47.js → dispense-registration-manager-DNibbp5F.js}

@@ -1,9 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 import { kosModel, Kos, isKosModel, resolveServiceUrl, ServiceFactory, KosLog, KosModelContainer, KosExtensionUtils, kosChild, FetchError, ExtensionManager, EXTENSION_TROUBLE_MAPPER, EXTENSION_TROUBLE_DATA_MAPPER, getKosModelSync, kosDependency, kosTroubleAware, kosAction, kosTopicHandler, DependencyLifecycle, getKosModel, FutureManager, kosFuture, FutureHandler, EXTENSION_FEATURE_FLAG_RESOLVER, isKosDataModel, ChildModels, KosFeatureFlags, kosParentAware, createPropKey, kosStateEntry, kosStateExit, kosStateGuard, kosLoggerAware, kosStateMachine, MultipleFutureHandler, arraysEqual, getAllKosCompanionModels, EventBus, KosContextManager, destroyKosModel, SingletonKosModelRegistrationFactory, kosFutureAware, ObservableData, KosModelRegistrationFactory, KosModelRegistry as KosModelRegistry$1, RegistrationManager, registerCoreModels, registerLegacyModel } from "@kosdev-code/kos-ui-sdk";
 import "react";
 var ExtensionType = /* @__PURE__ */ ((ExtensionType2) => {
@@ -46,6 +40,11 @@ var __decorateClass$c = (decorators, target, key, kind) => {
 };
 const MODEL_TYPE$c = "ingredient-model";
 let IngredientModelImpl = class {
+  id;
+  ingredientId;
+  name;
+  type;
+  data;
   constructor(modelId, {
     name,
     type,
@@ -53,11 +52,6 @@ let IngredientModelImpl = class {
     ingredientId,
     ...rest
   }) {
-    __publicField(this, "id");
-    __publicField(this, "ingredientId");
-    __publicField(this, "name");
-    __publicField(this, "type");
-    __publicField(this, "data");
     this.id = modelId;
     this.ingredientId = ingredientId;
     this.name = name;
@@ -112,16 +106,15 @@ var __decorateClass$b = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$9(target, key, result);
+  if (kind && result) __defProp$9(target, key, result);
   return result;
 };
 const MODEL_TYPE$b = "ingredient-container-model";
 const log$3 = KosLog.createLogger({ name: "ingredient-container-model" });
 let IngredientContainerModelImpl = class {
+  id;
+  ingredients;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    __publicField(this, "ingredients");
     this.id = modelId;
     this.ingredients = new KosModelContainer({
       indexMap: {
@@ -138,19 +131,18 @@ let IngredientContainerModelImpl = class {
     return this.ingredients.getIndexByKey("ingredientType", type);
   }
   async load(context) {
-    var _a;
     log$3.debug(`loading ingredient container ${this.id}`);
     const allIngredients = await getIngredients();
-    if ((allIngredients == null ? void 0 : allIngredients.status) !== 200) {
+    if (allIngredients?.status !== 200) {
       throw new Error("Failed to load ingredients");
     }
     const ingredientContext = await KosExtensionUtils.executeLoaderExtension({
       context,
       extension: ExtensionType.IngredientLoader
     });
-    const ingredientData = (allIngredients == null ? void 0 : allIngredients.data) ?? {};
+    const ingredientData = allIngredients?.data ?? {};
     for (const key of Object.keys(ingredientData)) {
-      for (const ingredientData2 of ((_a = allIngredients == null ? void 0 : allIngredients.data) == null ? void 0 : _a[key]) || []) {
+      for (const ingredientData2 of allIngredients?.data?.[key] || []) {
         const data = await KosExtensionUtils.executeDataMapperExtension({
           extension: ExtensionType.IngredientMapper,
           data: ingredientData2,
@@ -226,8 +218,7 @@ const unassignHolderIngredient = async (holderPath) => {
   return response;
 };
 const replaceLine = async (holderPath) => {
-  if (!holderPath)
-    throw new Error("Missing holderPath");
+  if (!holderPath) throw new Error("Missing holderPath");
   log$2.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${holderPath}`
   );
@@ -248,7 +239,6 @@ const getAssignments = async () => {
   return response;
 };
 const sendRfidOverride = async (holderPath, overrides) => {
-  var _a, _b, _c, _d;
   const factoryJson = JSON.stringify(overrides);
   const url = `${URL$4}/api/ext/dispense/assignments`;
   try {
@@ -256,15 +246,15 @@ const sendRfidOverride = async (holderPath, overrides) => {
       model: { holderPath, factoryJson },
       urlOverride: url
     });
-    if ((response == null ? void 0 : response.status) === 200 && ((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.error)) {
+    if (response?.status === 200 && response?.data?.error) {
       return [response.data.error || "unknownError", response.data];
     }
-    return [void 0, response == null ? void 0 : response.data];
+    return [void 0, response?.data];
   } catch (error) {
     if (error instanceof FetchError) {
       return [
-        ((_c = (_b = error.payload) == null ? void 0 : _b.data) == null ? void 0 : _c.error) || "unknownError",
-        (_d = error.payload) == null ? void 0 : _d.data
+        error.payload?.data?.error || "unknownError",
+        error.payload?.data
       ];
     }
   }
@@ -290,8 +280,7 @@ var __decorateClass$a = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$8(target, key, result);
+  if (kind && result) __defProp$8(target, key, result);
   return result;
 };
 const MODEL_TYPE$a = DispenseModelType.Holder;
@@ -315,7 +304,7 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
         const ingredientModel = pumpModel.ingredientId ? getKosModelSync(pumpModel.ingredientId).model : void 0;
         return {
           ingredientId: pumpModel.ingredientId,
-          ingredientName: (ingredientModel == null ? void 0 : ingredientModel.displayName) ?? ((ingredientModel == null ? void 0 : ingredientModel.name) || ""),
+          ingredientName: ingredientModel?.displayName ?? (ingredientModel?.name || ""),
           childPumpName: pumpModel.name
         };
       }
@@ -342,7 +331,7 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
       const ingredientId = trouble.data.ingredients[0];
       const { model } = getKosModelSync(ingredientId);
       return {
-        ingredientName: (model == null ? void 0 : model.displayName) ?? ((model == null ? void 0 : model.name) || ""),
+        ingredientName: model?.displayName ?? (model?.name || ""),
         ingredients: trouble.data.ingredients ? trouble.data.ingredients : [],
         unknonwnIngredientId: trouble.data.unknonwnIngredientId ?? ""
       };
@@ -351,14 +340,27 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
   }
 );
 class AssignmentError extends Error {
+  type;
   constructor(type, message) {
     super(message);
-    __publicField(this, "type");
     this.name = "AssignmentError";
     this.type = type;
   }
 }
 let HolderModelImpl = class {
+  id;
+  path;
+  name;
+  ingredientId;
+  ingredientType;
+  ingredientSource;
+  group;
+  slice;
+  logger;
+  data;
+  enjoyByDate;
+  pumps;
+  ingredientContainer;
   constructor(modelId, {
     path,
     name,
@@ -370,19 +372,6 @@ let HolderModelImpl = class {
     data,
     enjoyByDate
   }, context) {
-    __publicField(this, "id");
-    __publicField(this, "path");
-    __publicField(this, "name");
-    __publicField(this, "ingredientId");
-    __publicField(this, "ingredientType");
-    __publicField(this, "ingredientSource");
-    __publicField(this, "group");
-    __publicField(this, "slice");
-    __publicField(this, "logger");
-    __publicField(this, "data");
-    __publicField(this, "enjoyByDate");
-    __publicField(this, "pumps");
-    __publicField(this, "ingredientContainer");
     this.id = modelId;
     this.path = path;
     this.name = name;
@@ -424,8 +413,7 @@ let HolderModelImpl = class {
     return !!this.enjoyByDate && !this.unassigned;
   }
   get hasEnjoyByWarning() {
-    var _a;
-    return ((_a = this.troublesByType["EnjoyByTrouble"]) == null ? void 0 : _a.length) > 0;
+    return this.troublesByType["EnjoyByTrouble"]?.length > 0;
   }
   get nozzlePaths() {
     return this.pumps.data.map((pump) => pump.nozzlePath);
@@ -447,7 +435,7 @@ let HolderModelImpl = class {
     const intent = typeof props === "string" ? props : props.intent;
     const pumpPath = typeof props === "string" ? void 0 : props.pumpPath;
     const pump = pumpPath ? this.pumps.getModel(pumpPath) : this.pumps.data[0];
-    return pump == null ? void 0 : pump.performIntent({ intent });
+    return pump?.performIntent({ intent });
   }
   get pourState() {
     const state = this.pumps.data.reduce((resolvedState, pump) => {
@@ -459,8 +447,7 @@ let HolderModelImpl = class {
     return state;
   }
   get nozzlePath() {
-    var _a;
-    return (_a = this.pumps.data[0]) == null ? void 0 : _a.nozzlePath;
+    return this.pumps.data[0]?.nozzlePath;
   }
   get pumpPaths() {
     return this.pumps.data.map((pump) => pump.id);
@@ -477,11 +464,10 @@ let HolderModelImpl = class {
     });
   }
   get ingredient() {
-    var _a;
     if (!this.ingredientId) {
       return void 0;
     }
-    const ingredient = (_a = this.ingredientContainer) == null ? void 0 : _a.ingredients.getModel(
+    const ingredient = this.ingredientContainer?.ingredients.getModel(
       this.ingredientId
     );
     return ingredient;
@@ -496,11 +482,10 @@ let HolderModelImpl = class {
     }
   }
   get previousIngredient() {
-    var _a;
     if (!this.prevIngredientId) {
       return void 0;
     }
-    const ingredient = (_a = this.ingredientContainer) == null ? void 0 : _a.ingredients.getModel(
+    const ingredient = this.ingredientContainer?.ingredients.getModel(
       this.prevIngredientId
     );
     return ingredient;
@@ -515,8 +500,7 @@ let HolderModelImpl = class {
     }
   }
   get prevIngredientId() {
-    var _a, _b;
-    return (_b = (_a = this.pumps.data) == null ? void 0 : _a[0]) == null ? void 0 : _b.prevIngredientId;
+    return this.pumps.data?.[0]?.prevIngredientId;
   }
   get unassigned() {
     return (!this.ingredientId || this.ingredientId === "0") && (!this.prevIngredientId || this.prevIngredientId === "0");
@@ -570,7 +554,7 @@ let HolderModelImpl = class {
         );
       }
       kosAction(() => {
-        this.ingredientId = result == null ? void 0 : result.ingredientId;
+        this.ingredientId = result?.ingredientId;
       });
       return result;
     } catch (e) {
@@ -645,7 +629,6 @@ const Holder = {
   factory: Kos.Factory.create(MODEL_TYPE$a)
 };
 const mapAssemblyHolderToModel = async (group, holderData) => {
-  var _a;
   const _ingredientId = ExtensionManager.propertyMapper.executeMapper(
     ExtensionType.HolderIngredientMapper,
     holderData
@@ -668,7 +651,7 @@ const mapAssemblyHolderToModel = async (group, holderData) => {
     ingredientId: _ingredientId || ingredientId,
     ingredientType: type || ingType,
     ingredientSource: ingSource,
-    enjoyByDate: ((_a = holderData.container) == null ? void 0 : _a.enjoyByDate) ? new Date(holderData.container.enjoyByDate) : void 0,
+    enjoyByDate: holderData.container?.enjoyByDate ? new Date(holderData.container.enjoyByDate) : void 0,
     slice: sliceData,
     group,
     data: extData
@@ -696,18 +679,17 @@ var __decorateClass$9 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$7(target, key, result);
+  if (kind && result) __defProp$7(target, key, result);
   return result;
 };
 const MODEL_TYPE$9 = "board-container-model";
 const TOPIC_BOARD_LINKED = "/kos/hardware/board/linked";
 const TOPIC_BOARD_UNLINKED = "/kos/hardware/board/unlinked";
 let BoardContainerModel = class {
+  id;
+  logger;
+  models;
   constructor(modelId, options, context) {
-    __publicField(this, "id");
-    __publicField(this, "logger");
-    __publicField(this, "models");
     this.id = modelId;
     this.logger = context.logger;
     this.models = new KosModelContainer({
@@ -778,7 +760,7 @@ const boardTroubleDataMapper = async (trouble) => {
   const boardPath = trouble.data.boardPath;
   const { model } = getKosModelSync(boardPath);
   return {
-    boardName: (model == null ? void 0 : model.name) || ""
+    boardName: model?.name || ""
   };
 };
 var __defProp$6 = Object.defineProperty;
@@ -788,8 +770,7 @@ var __decorateClass$8 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$6(target, key, result);
+  if (kind && result) __defProp$6(target, key, result);
   return result;
 };
 const MODEL_TYPE$8 = DispenseModelType.PumpContainer;
@@ -800,9 +781,9 @@ var PumpIndex = /* @__PURE__ */ ((PumpIndex2) => {
   return PumpIndex2;
 })(PumpIndex || {});
 let PumpContainerModelImpl = class {
+  id;
+  pumps;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    __publicField(this, "pumps");
     this.id = modelId;
     this.pumps = new KosModelContainer({
       indexMap: {
@@ -891,7 +872,7 @@ const boardTroubleResolver = async (trouble) => {
   const pumpContainer = await getKosModel(
     PumpContainer.type
   );
-  if (pumpContainer == null ? void 0 : pumpContainer.model) {
+  if (pumpContainer?.model) {
     const boardPumps = pumpContainer.model.models.getIndexByKey(
       PumpIndex.byBoard,
       boardPath
@@ -936,14 +917,14 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
   boardTroubleDataMapper
 );
 let BoardModelImpl = class {
+  id;
+  type;
+  name;
+  path;
+  linked;
+  instanceId;
+  logger;
   constructor(modelId, options, context) {
-    __publicField(this, "id");
-    __publicField(this, "type");
-    __publicField(this, "name");
-    __publicField(this, "path");
-    __publicField(this, "linked");
-    __publicField(this, "instanceId");
-    __publicField(this, "logger");
     this.id = modelId;
     this.logger = context.logger;
     mapOptionsToModel(options, this);
@@ -994,8 +975,7 @@ var __decorateClass$6 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$5(target, key, result);
+  if (kind && result) __defProp$5(target, key, result);
   return result;
 };
 const MODEL_TYPE$6 = DispenseModelType.HolderContainer;
@@ -1006,10 +986,10 @@ const TOPIC_REMOVE = "/kos/insertion/remove";
 const TOPIC_REPLACE_LINE = "/kos/pumpEvent/replaceLine";
 const TOPIC_HOLDER_CHANGED = "/kos/handle/*";
 let HolderContainerModelImpl = class {
+  id;
+  holders;
+  logger;
   constructor(modelId, _options, context) {
-    __publicField(this, "id");
-    __publicField(this, "holders");
-    __publicField(this, "logger");
     this.id = modelId;
     this.holders = new KosModelContainer({
       indexMap: {
@@ -1024,7 +1004,6 @@ let HolderContainerModelImpl = class {
   updateModel() {
   }
   handleHolderEvents(event) {
-    var _a, _b, _c;
     KosLog.ifDebug(
       () => this.logger.debug("Received holder change event", JSON.stringify(event))
     );
@@ -1033,9 +1012,9 @@ let HolderContainerModelImpl = class {
       this.logger.info(
         `Received change event for holder ${holder.path}.  Updating fuel gauge data.`
       );
-      holder.slice.currentVolMl = (_a = event.slice) == null ? void 0 : _a.currentVolMl;
-      holder.slice.maxVolMl = (_b = event.slice) == null ? void 0 : _b.maxVolMl;
-      if ((_c = event == null ? void 0 : event.container) == null ? void 0 : _c.enjoyByDate) {
+      holder.slice.currentVolMl = event.slice?.currentVolMl;
+      holder.slice.maxVolMl = event.slice?.maxVolMl;
+      if (event?.container?.enjoyByDate) {
         holder.enjoyByDate = new Date(event.container.enjoyByDate);
       } else {
         holder.enjoyByDate = void 0;
@@ -1049,7 +1028,6 @@ let HolderContainerModelImpl = class {
     const wrappedData = Array.isArray(data) ? data : [data];
     wrappedData.forEach((event) => {
       kosAction(() => {
-        var _a, _b, _c;
         const ingredientId = event.ingredientId;
         const holder = this.holders.getModel(event.path);
         if (holder) {
@@ -1057,9 +1035,9 @@ let HolderContainerModelImpl = class {
             `Received insertion event for holder ${holder.path}`
           );
           holder.updateIngredient(ingredientId);
-          holder.slice.currentVolMl = (_a = event.slice) == null ? void 0 : _a.currentVolMl;
-          holder.slice.maxVolMl = (_b = event.slice) == null ? void 0 : _b.maxVolMl;
-          if ((_c = event == null ? void 0 : event.container) == null ? void 0 : _c.enjoyByDate) {
+          holder.slice.currentVolMl = event.slice?.currentVolMl;
+          holder.slice.maxVolMl = event.slice?.maxVolMl;
+          if (event?.container?.enjoyByDate) {
             holder.enjoyByDate = new Date(event.container.enjoyByDate);
           } else {
             holder.enjoyByDate = void 0;
@@ -1166,7 +1144,7 @@ const sendIntent = async ({
 }) => {
   const url = `${URL$2}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${pumpId}/${intent}`;
   const response = await postModel$2({ model: {}, urlOverride: url, tracker });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
@@ -1174,7 +1152,7 @@ const sendIntent = async ({
 const getIntentVolume = async (pumpId, intent) => {
   const url = `${URL$2}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${pumpId}/${intent}/volume`;
   const response = await getOne$1({ urlOverride: url });
-  if (!(response == null ? void 0 : response.data)) {
+  if (!response?.data) {
     return { volume: -1 };
   }
   return response.data;
@@ -1186,8 +1164,7 @@ var __decorateClass$5 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$4(target, key, result);
+  if (kind && result) __defProp$4(target, key, result);
   return result;
 };
 const MODEL_TYPE$5 = DispenseModelType.Pump;
@@ -1196,25 +1173,25 @@ ExtensionManager[EXTENSION_TROUBLE_MAPPER].register(
   pumpTroubleResolver
 );
 let PumpModelImpl = class {
+  id;
+  inserted;
+  type;
+  virtual;
+  ingredientId;
+  holderPath;
+  boardPath;
+  nozzlePath;
+  childPump;
+  name;
+  path;
+  prevIngredientId;
+  /**
+   * @kosApiLevel 12
+   */
+  state;
+  futureHandler;
+  currentState = PourState.IDLE;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    __publicField(this, "inserted");
-    __publicField(this, "type");
-    __publicField(this, "virtual");
-    __publicField(this, "ingredientId");
-    __publicField(this, "holderPath");
-    __publicField(this, "boardPath");
-    __publicField(this, "nozzlePath");
-    __publicField(this, "childPump");
-    __publicField(this, "name");
-    __publicField(this, "path");
-    __publicField(this, "prevIngredientId");
-    /**
-     * @kosApiLevel 12
-     */
-    __publicField(this, "state");
-    __publicField(this, "futureHandler");
-    __publicField(this, "currentState", PourState.IDLE);
     this.id = modelId;
     const {
       inserted,
@@ -1269,12 +1246,10 @@ let PumpModelImpl = class {
   }
   // -------------------LIFECYCLE----------------------------
   get pouringState() {
-    var _a;
-    return ((_a = this.future) == null ? void 0 : _a.endState) || "";
+    return this.future?.endState || "";
   }
   get isPouring() {
-    var _a;
-    return !!(this.future && !((_a = this.future) == null ? void 0 : _a.endState)) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING;
+    return !!(this.future && !this.future?.endState) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING;
   }
   get canPour() {
     return !!this.ingredientId && !this.isPouring;
@@ -1287,10 +1262,9 @@ let PumpModelImpl = class {
     }
   }
   async cancelPour() {
-    var _a;
     if (this.currentState === PourState.POURING || this.currentState === PourState.POUR_STARTING) {
       this.currentState = PourState.POUR_CANCELING;
-      await ((_a = this.future) == null ? void 0 : _a.cancelFuture());
+      await this.future?.cancelFuture();
       kosAction(() => {
         this.currentState = PourState.IDLE;
       });
@@ -1325,7 +1299,7 @@ let PumpModelImpl = class {
             this.currentState = PourState.POURING;
           });
         }
-        return result == null ? void 0 : result.data;
+        return result?.data;
       } else {
         throw new Error(`Cannot pour in state ${this.currentState}`);
       }
@@ -1376,18 +1350,17 @@ const mapAssemblyPumpToModel = (nozzlePath, pump) => {
   return pumpModel;
 };
 const assemblyPumpMap = (pumpContainer) => (holderContainer) => (nozzle) => (assemblyPump) => {
-  var _a;
   try {
     Logger.debug(`adding pump ${assemblyPump.name}`);
     const pump = mapAssemblyPumpToModel(nozzle.path, assemblyPump);
     pumpContainer.addModel(pump);
     const holderPath = pump.holderPath;
     const holder = holderContainer.holders.getModel(holderPath);
-    holder == null ? void 0 : holder.pumps.addModel(pump);
-    if (!(holder == null ? void 0 : holder.nozzlePaths.includes(nozzle.path))) {
-      holder == null ? void 0 : holder.nozzlePaths.push(nozzle.path);
+    holder?.pumps.addModel(pump);
+    if (!holder?.nozzlePaths.includes(nozzle.path)) {
+      holder?.nozzlePaths.push(nozzle.path);
     }
-    (_a = assemblyPump == null ? void 0 : assemblyPump.pumps) == null ? void 0 : _a.forEach((subPump) => {
+    assemblyPump?.pumps?.forEach((subPump) => {
       const subHolderPath = pump.holderPath;
       const subPumpData = {
         ...subPump,
@@ -1409,22 +1382,21 @@ var __decorateClass$4 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$3(target, key, result);
+  if (kind && result) __defProp$3(target, key, result);
   return result;
 };
 const MODEL_TYPE$4 = "assembly-model";
 const CONTEXT_ASSEMBLY_DATA = "assembly-data";
 const CONTEXT_ASSEMBLY_RAW_DATA = "assembly-raw-data";
 let AssemblyModelImpl = class {
+  id;
+  _nozzlePaths = /* @__PURE__ */ new Set();
+  troubleContainer;
+  holderContainer;
+  boardContainer;
+  pumpContainer;
+  logger;
   constructor(modelId, _options, context) {
-    __publicField(this, "id");
-    __publicField(this, "_nozzlePaths", /* @__PURE__ */ new Set());
-    __publicField(this, "troubleContainer");
-    __publicField(this, "holderContainer");
-    __publicField(this, "boardContainer");
-    __publicField(this, "pumpContainer");
-    __publicField(this, "logger");
     this.id = modelId;
     this.holderContainer = HolderContainer.factory({});
     this.boardContainer = BoardContainer.factory({});
@@ -1471,8 +1443,7 @@ let AssemblyModelImpl = class {
     this.logger.debug(`initializing assembly ${this.id}`);
   }
   async ready() {
-    var _a;
-    (_a = this.troubleContainer) == null ? void 0 : _a.troubles.increment();
+    this.troubleContainer?.troubles.increment();
     ExtensionManager[EXTENSION_FEATURE_FLAG_RESOLVER].execute(
       ExtensionType.AssemblyFeatureFlags,
       this
@@ -1481,7 +1452,7 @@ let AssemblyModelImpl = class {
   async load(context) {
     this.logger.debug(`loading assembly ${this.id}`);
     const result = await getAssembly();
-    if ((result == null ? void 0 : result.status) === 200) {
+    if (result?.status === 200) {
       const data = await KosExtensionUtils.executeDataMapperExtension({
         extension: ExtensionType.AssemblyMapper,
         data: result.data,
@@ -1509,11 +1480,10 @@ let AssemblyModelImpl = class {
         this.logger.debug(`adding assembly ${name}`);
         this.logger.warn(`Assembly rest keys: ${Object.keys(rest).join(", ")}`);
         Object.keys(rest).forEach((key) => {
-          var _a;
           this.logger.warn(`Enabling feature flag: ${key}`);
           KosFeatureFlags.enableFeature(key);
           context.set(`assembly-feature-${key}`, rest[key]);
-          if (((_a = rest[key]["state"]) == null ? void 0 : _a["path"]) !== void 0) {
+          if (rest[key]["state"]?.["path"] !== void 0) {
             const statePath = rest[key]["state"]["path"];
             this.logger.warn(`Feature flag ${key} state path: ${statePath}`);
             context.set(`assembly-state-path-${key}`, statePath);
@@ -1583,20 +1553,20 @@ var __decorateClass$3 = (decorators, target, key, kind) => {
 };
 const MODEL_TYPE$3 = DispenseModelType.Availability;
 let AvailabilityModelImpl = class {
+  id;
+  data;
+  properties;
+  available;
+  visible;
+  groupId;
+  rawId;
+  altId;
+  type;
+  note;
+  taggedIds;
+  parentId;
+  logger;
   constructor(modelId, options, context) {
-    __publicField(this, "id");
-    __publicField(this, "data");
-    __publicField(this, "properties");
-    __publicField(this, "available");
-    __publicField(this, "visible");
-    __publicField(this, "groupId");
-    __publicField(this, "rawId");
-    __publicField(this, "altId");
-    __publicField(this, "type");
-    __publicField(this, "note");
-    __publicField(this, "taggedIds");
-    __publicField(this, "parentId");
-    __publicField(this, "logger");
     this.id = modelId;
     this.taggedIds = options.taggedIds || [];
     this.logger = context.logger;
@@ -1651,11 +1621,11 @@ const { postModel: postModel$1, deleteModel, getOne } = ServiceFactory.build({
 const pourPourable = async (nozzleId, tracker) => {
   const response = await postModel$1({
     model: {},
-    urlOverride: `${URL$1}/api/ext/dispense/nozzle/${nozzleId}/pipeline/beverage/pour`,
+    urlOverride: `${URL$1}/api/ext/dispense/nozzle/${nozzleId}/pipeline/beverage/pour/selected/maxVolume`,
     ordered: true,
     tracker
   });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
@@ -1667,7 +1637,7 @@ const pourNamedPourable = async (name, nozzleId, tracker) => {
     ordered: true,
     tracker
   });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
@@ -1699,8 +1669,7 @@ var __decorateClass$2 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$2(target, key, result);
+  if (kind && result) __defProp$2(target, key, result);
   return result;
 };
 const MODEL_TYPE$2 = DispenseModelType.Nozzle;
@@ -1712,37 +1681,18 @@ const TOPIC_NOZZLE_POUR_STARTED = "/kos/nozzle/pour/started";
 const TOPIC_NOZZLE_POUR_PROGRESS = "/kos/nozzle/pour/progress";
 const TOPIC_NOZZLE_POUR_CANCEL = "/kos/nozzle/pour/cancel";
 let NozzleModelImpl = class {
-  constructor(modelId, options) {
-    /** the unique identifier for this nozzle.*/
-    __publicField(this, "id");
-    __publicField(this, "path");
-    __publicField(this, "name");
-    __publicField(this, "_selectedBeverage");
-    __publicField(this, "_selectedBrand");
-    __publicField(this, "_additionalItems");
-    __publicField(this, "_availabilityItems");
-    __publicField(this, "futureHandler");
-    __publicField(this, "beverageTopicPrefix");
-    __publicField(this, "topicPrefix");
-    __publicField(this, "urlPrefix");
-    this.id = modelId;
-    this.path = options.path;
-    this.name = options.name;
-    this.beverageTopicPrefix = options.beverageTopicPrefix;
-    this.topicPrefix = options.topicPrefix;
-    this.urlPrefix = options.urlPrefix;
-    this._selectedBeverage = void 0;
-    this._selectedBrand = void 0;
-    this._additionalItems = [];
-    this.futureHandler = new MultipleFutureHandler(this);
-    this._availabilityItems = new KosModelContainer({
-      indexMap: {
-        byGroup: "groupId",
-        byParent: "parentId"
-      },
-      parentId: modelId
-    });
-  }
+  /** the unique identifier for this nozzle.*/
+  id;
+  path;
+  name;
+  _selectedBeverage;
+  _selectedBrand;
+  _additionalItems;
+  _availabilityItems;
+  futureHandler;
+  beverageTopicPrefix;
+  topicPrefix;
+  urlPrefix;
   /**
    * The availability nodes that can be dispensed from this nozzle.
    * This is a subset of the availability for the entire dispenser
@@ -1769,8 +1719,7 @@ let NozzleModelImpl = class {
    * @readonly
    */
   get isPouring() {
-    var _a;
-    return !!(this.futureHandler.getFuture() && !((_a = this.futureHandler.getFuture()) == null ? void 0 : _a.endState)) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
+    return !!(this.futureHandler.getFuture() && !this.futureHandler.getFuture()?.endState) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
   }
   /**
    * A derived value that indicates if the nozzle is currently available to pour a beverage.
@@ -1801,8 +1750,26 @@ let NozzleModelImpl = class {
     return this.futureHandler.getFuture();
   }
   get pourProgress() {
-    var _a;
-    return ((_a = this.future) == null ? void 0 : _a.progress) ?? 0;
+    return this.future?.progress ?? 0;
+  }
+  constructor(modelId, options) {
+    this.id = modelId;
+    this.path = options.path;
+    this.name = options.name;
+    this.beverageTopicPrefix = options.beverageTopicPrefix;
+    this.topicPrefix = options.topicPrefix;
+    this.urlPrefix = options.urlPrefix;
+    this._selectedBeverage = void 0;
+    this._selectedBrand = void 0;
+    this._additionalItems = [];
+    this.futureHandler = new MultipleFutureHandler(this);
+    this._availabilityItems = new KosModelContainer({
+      indexMap: {
+        byGroup: "groupId",
+        byParent: "parentId"
+      },
+      parentId: modelId
+    });
   }
   updateModel() {
   }
@@ -1828,7 +1795,7 @@ let NozzleModelImpl = class {
   async setSelectedPourable({ beverage, additional, context }, forceUpdate = false) {
     if (!beverage) {
       const response2 = await clearPourable(this.name);
-      if ((response2 == null ? void 0 : response2.status) !== 200) {
+      if (response2?.status !== 200) {
         throw new Error("Failed to clear pourable");
       }
       this._selectedBeverage = void 0;
@@ -1867,7 +1834,7 @@ let NozzleModelImpl = class {
     }
     const payload = selectedPayload ?? defaultPayload;
     const response = await selectPourable(this.name, payload);
-    if ((response == null ? void 0 : response.status) !== 200) {
+    if (response?.status !== 200) {
       throw new Error("Failed to select pourable");
     }
   }
@@ -1904,9 +1871,8 @@ let NozzleModelImpl = class {
   handlePouringStart() {
     this.logger.info("Pour started");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware$1(model)) {
-        (_a = model.onPourStart) == null ? void 0 : _a.call(model);
+        model.onPourStart?.();
       }
     });
   }
@@ -1919,9 +1885,8 @@ let NozzleModelImpl = class {
   handleCanceled() {
     this.logger.info("Pour canceled");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware$1(model)) {
-        (_a = model.onPourCancel) == null ? void 0 : _a.call(model);
+        model.onPourCancel?.();
       }
     });
     const evt = {
@@ -1961,7 +1926,6 @@ let NozzleModelImpl = class {
   }
   // Inherits throwOnInvalid: false from class
   async pour(tracker) {
-    var _a;
     try {
       this.transition("START_POUR");
       if (!tracker) {
@@ -1974,7 +1938,7 @@ let NozzleModelImpl = class {
         type: "free"
       };
       EventBus.publish(TOPIC_NOZZLE_POUR_STARTED, evt);
-      if ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.endState) {
+      if (result?.data?.endState) {
         this.transition("POUR_COMPLETED");
       }
       return result;
@@ -1988,7 +1952,6 @@ let NozzleModelImpl = class {
   }
   // Inherits throwOnInvalid: false from class
   async fixedPour(name, tracker) {
-    var _a;
     try {
       this.transition("START_POUR");
       if (!tracker) {
@@ -2001,7 +1964,7 @@ let NozzleModelImpl = class {
         type: "fixed"
       };
       EventBus.publish(TOPIC_NOZZLE_POUR_STARTED, evt);
-      if ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.endState) {
+      if (result?.data?.endState) {
         this.transition("POUR_COMPLETED");
       }
       return result;
@@ -2015,9 +1978,8 @@ let NozzleModelImpl = class {
   }
   // Inherits throwOnInvalid: false - silently ignore if already idle
   async cancelPour() {
-    var _a;
     this.transition("CANCEL_POUR");
-    await ((_a = this.futureHandler.getFuture()) == null ? void 0 : _a.cancelFuture());
+    await this.futureHandler.getFuture()?.cancelFuture();
     this.transition("POUR_CANCELED");
   }
   updateGroupMembers() {
@@ -2036,20 +1998,19 @@ let NozzleModelImpl = class {
   }
   /** @internal */
   async load(context) {
-    var _a, _b;
     this.logger.debug(`loading nozzle ${this.id}`);
     const availability = await getAvailability(this.urlPrefix);
-    if ((availability == null ? void 0 : availability.status) !== 200) {
+    if (availability?.status !== 200) {
       throw new Error("Failed to load nozzle availability");
     }
     const beverageContext = await ExtensionManager.loader.executeLoader(
       ExtensionType.AvailabilityLoader,
       {}
     );
-    context == null ? void 0 : context.set(ExtensionType.AvailabilityLoader, beverageContext);
-    context == null ? void 0 : context.set(Nozzle.type, this);
-    for (const group of Object.keys((_a = availability.data) == null ? void 0 : _a.groups) || []) {
-      for (const beverageData of ((_b = availability.data) == null ? void 0 : _b.groups[group]) || []) {
+    context?.set(ExtensionType.AvailabilityLoader, beverageContext);
+    context?.set(Nozzle.type, this);
+    for (const group of Object.keys(availability.data?.groups) || []) {
+      for (const beverageData of availability.data?.groups[group] || []) {
         const extensionData = await ExtensionManager.dataMapper.executeMapper(
           ExtensionType.AvailabilityMapper,
           { ...beverageData, groupId: group },
@@ -2074,9 +2035,9 @@ let NozzleModelImpl = class {
   }
   async updateAvailability(update) {
     const context = KosContextManager.getContext(this.id);
-    const beverageContext = (context == null ? void 0 : context.get(ExtensionType.AvailabilityLoader)) || {};
+    const beverageContext = context?.get(ExtensionType.AvailabilityLoader) || {};
     if (update.rebuild) {
-      for (const group of Object.keys(update == null ? void 0 : update.groups) || []) {
+      for (const group of Object.keys(update?.groups) || []) {
         const deletedBeverages = this._availabilityItems.getIndexByKey("group", group).filter(
           (beverage) => !update.groups[group].find(
             (b) => `${this.id}-${group}-${b.id}` === beverage.id
@@ -2086,7 +2047,7 @@ let NozzleModelImpl = class {
           this._availabilityItems.removeModel(beverage.id);
           destroyKosModel(beverage);
         });
-        for (const beverageData of (update == null ? void 0 : update.groups[group]) || []) {
+        for (const beverageData of update?.groups[group] || []) {
           const extensionData = await ExtensionManager.dataMapper.executeMapper(
             ExtensionType.AvailabilityMapper,
             { ...beverageData, groupId: group },
@@ -2116,8 +2077,8 @@ let NozzleModelImpl = class {
         }
       }
     } else {
-      for (const group of Object.keys(update == null ? void 0 : update.groups) || []) {
-        for (const beverageData of (update == null ? void 0 : update.groups[group]) || []) {
+      for (const group of Object.keys(update?.groups) || []) {
+        for (const beverageData of update?.groups[group] || []) {
           const extensionData = await ExtensionManager.dataMapper.executeMapper(
             ExtensionType.AvailabilityMapper,
             { ...beverageData, groupId: group },
@@ -2239,16 +2200,15 @@ var __decorateClass$1 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$1(target, key, result);
+  if (kind && result) __defProp$1(target, key, result);
   return result;
 };
 const MODEL_TYPE$1 = "device-assembly-model";
 let DeviceAssemblyModelImpl = class {
+  id;
+  deviceNozzles;
+  logger;
   constructor(modelId, _options, context) {
-    __publicField(this, "id");
-    __publicField(this, "deviceNozzles");
-    __publicField(this, "logger");
     this.id = modelId;
     this.logger = context.logger;
     this.deviceNozzles = new KosModelContainer();
@@ -2266,12 +2226,11 @@ let DeviceAssemblyModelImpl = class {
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
     const result = await getAssembly();
-    if ((result == null ? void 0 : result.status) === 200) {
+    if (result?.status === 200) {
       const nozzles = result.data.assemblies.map((assembly) => assembly.nozzles ?? []).flat();
       nozzles.forEach((nozzleData) => {
-        var _a;
         const nozzleId = nozzleData.path;
-        const beverageTopicPrefix = ((_a = nozzleData.pipelines.find((pipeline) => pipeline.name === "beverage")) == null ? void 0 : _a.topicPrefix) || "";
+        const beverageTopicPrefix = nozzleData.pipelines.find((pipeline) => pipeline.name === "beverage")?.topicPrefix || "";
         const nozzle = Nozzle.factory(nozzleId)({
           path: nozzleData.path,
           name: nozzleData.name,
@@ -2305,20 +2264,19 @@ const pourOnTarget = async (path, tracker) => {
     ordered: true,
     tracker
   });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
 };
-var __defProp2 = Object.defineProperty;
+var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp2(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 const MODEL_TYPE = "generic-pour-model";
@@ -2327,18 +2285,18 @@ const TOPIC_GENERIC_POUR_PROGRESS = "/kos/generic/pour/progress";
 const TOPIC_GENERIC_POUR_CANCEL = "/kos/generic/pour/cancel";
 const isPourAware = (model) => model.onPourStart !== void 0 && model.onPourCancel !== void 0 && model.onPourProgress !== void 0;
 let GenericPourModelImpl = class {
+  id;
+  /**
+   * @kosApiLevel 5
+   */
+  servicePathFactory;
+  pourType;
+  /**
+   * @kosApiLevel 5
+   */
+  selectedId;
+  state;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    /**
-     * @kosApiLevel 5
-     */
-    __publicField(this, "servicePathFactory");
-    __publicField(this, "pourType");
-    /**
-     * @kosApiLevel 5
-     */
-    __publicField(this, "selectedId");
-    __publicField(this, "state");
     this.id = modelId;
     this.futureHandler = new FutureHandler(this);
     this.servicePathFactory = options.servicePathFactory;
@@ -2384,9 +2342,8 @@ let GenericPourModelImpl = class {
   handlePouringStart() {
     this.logger.info("Pour started");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware(model)) {
-        (_a = model.onPourStart) == null ? void 0 : _a.call(model);
+        model.onPourStart?.();
       }
     });
     const evt = {
@@ -2404,9 +2361,8 @@ let GenericPourModelImpl = class {
   handleCanceled() {
     this.logger.info("Pour canceled");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware(model)) {
-        (_a = model.onPourCancel) == null ? void 0 : _a.call(model);
+        model.onPourCancel?.();
       }
     });
     const evt = {
@@ -2416,7 +2372,6 @@ let GenericPourModelImpl = class {
   }
   // Inherits throwOnInvalid: false from class
   async pour(tracker) {
-    var _a;
     try {
       this.transition("START_POUR");
       if (!tracker) {
@@ -2424,7 +2379,7 @@ let GenericPourModelImpl = class {
       }
       const result = await pourOnTarget(this.servicePath, tracker);
       this.transition("POUR_ACTIVE");
-      if ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.endState) {
+      if (result?.data?.endState) {
         this.transition("POUR_COMPLETED");
       }
       return result;
@@ -2438,9 +2393,8 @@ let GenericPourModelImpl = class {
   }
   // Inherits throwOnInvalid: false - silently ignore if already idle
   async cancelPour() {
-    var _a;
     this.transition("CANCEL_POUR");
-    await ((_a = this.futureHandler.getFuture()) == null ? void 0 : _a.cancelFuture());
+    await this.futureHandler.getFuture()?.cancelFuture();
     this.transition("POUR_CANCELED");
   }
   // ============================================================================
@@ -2451,8 +2405,7 @@ let GenericPourModelImpl = class {
    * @readonly
    */
   get isPouring() {
-    var _a;
-    return !!(this.future && !((_a = this.future) == null ? void 0 : _a.endState)) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
+    return !!(this.future && !this.future?.endState) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
   }
   /**
    * A derived value that indicates if the pour target is currently available to pour a beverage.
@@ -2587,8 +2540,7 @@ const registerDispenseModels = (root) => () => {
   ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
     "FirmwareUpdateInProgressTrouble",
     async (trouble) => {
-      var _a;
-      if ((_a = trouble.data) == null ? void 0 : _a.deviceId) {
+      if (trouble.data?.deviceId) {
         const { model: assemblyModel } = getKosModelSync(
           Assembly.type
         );
@@ -2624,9 +2576,9 @@ _KosModelRegistry.legacy = RegistrationManager.model.registerLegacyModel(_KosMod
 const KosModelRegistry = _KosModelRegistry;
 export {
   Assembly as A,
-  BoardContainerModel as B,
+  Board as B,
   CONTEXT_ASSEMBLY_DATA as C,
-  DispenseModelType as D,
+  DeviceAssembly as D,
   ExtensionType as E,
   getIntentVolume as F,
   GenericPour as G,
@@ -2638,25 +2590,25 @@ export {
   getAvailability as M,
   Nozzle as N,
   pourNamedPourable as O,
-  Pump as P,
+  PourState as P,
   pourPourable as Q,
   selectPourable as R,
   pourOnTarget as S,
   TOPIC_BOARD_LINKED as T,
-  CONTEXT_ASSEMBLY_RAW_DATA as a,
-  Availability as b,
-  TOPIC_BOARD_UNLINKED as c,
-  BoardContainer as d,
-  Board as e,
-  DeviceAssembly as f,
-  TOPIC_GENERIC_POUR_CANCEL as g,
-  TOPIC_GENERIC_POUR_PROGRESS as h,
-  TOPIC_GENERIC_POUR_STARTED as i,
-  HolderContainer as j,
-  IngredientContainer as k,
-  PumpContainer as l,
-  PumpIndex as m,
-  PourState as n,
+  Availability as a,
+  BoardContainer as b,
+  BoardContainerModel as c,
+  CONTEXT_ASSEMBLY_RAW_DATA as d,
+  DispenseModelType as e,
+  HolderContainer as f,
+  IngredientContainer as g,
+  Pump as h,
+  PumpContainer as i,
+  PumpIndex as j,
+  TOPIC_BOARD_UNLINKED as k,
+  TOPIC_GENERIC_POUR_CANCEL as l,
+  TOPIC_GENERIC_POUR_PROGRESS as m,
+  TOPIC_GENERIC_POUR_STARTED as n,
   kosModels as o,
   getIngredients as p,
   addAssignment as q,
@@ -2670,4 +2622,4 @@ export {
   unassignHolderIngredient as y,
   getAssembly as z
 };
-//# sourceMappingURL=dispense-registration-manager-C7GGaZ47.js.map
+//# sourceMappingURL=dispense-registration-manager-DNibbp5F.js.map