@wix/headless-restaurants-olo 0.0.62 → 0.0.63

package/cjs/dist/services/utils.d.ts

@@ -11,6 +11,7 @@ export declare const getFirstPreSelectedModifier: (modifiers: EnhancedModifier[]
 export declare const getPreSelectedModifiers: (modifiers: EnhancedModifier[]) => string[];
 export declare const convertModifierToFormModifier: (modifier: EnhancedModifier, index: number) => {
     _id: string;
+    modifierId: string | null | undefined;
     revision?: string | null;
     _createdDate?: Date | null;
     _updatedDate?: Date | null;
@@ -40,6 +41,22 @@ export declare const getModifierGroupErrors: (selectedModifiers: Record<string,
     hasError: boolean;
 };
 export declare const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock: (modifierGroups: EnhancedModifierGroup[]) => boolean;
+export declare const findModifierByFormId: (modifierGroup: EnhancedModifierGroup | undefined, selectedModifierId: string) => {
+    _id: string;
+    modifierId: string | null | undefined;
+    revision?: string | null;
+    _createdDate?: Date | null;
+    _updatedDate?: Date | null;
+    name?: string | null;
+    extendedFields?: import("@wix/auto_sdk_restaurants_item-modifiers").ExtendedFields;
+    inStock?: boolean | null;
+    businessLocationIds?: string[];
+    additionalChargeInfo?: {
+        additionalCharge?: string;
+        formattedAdditionalCharge?: string;
+    };
+    preSelected?: boolean;
+} | undefined;
 export declare const getLineItemModifiers: (selectedModifiers: Record<string, Array<string>>, modifierGroups: EnhancedModifierGroup[], formatCurrency: (price?: number) => string) => {
     id: string;
     modifiers: {

package/cjs/dist/services/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAvailabilityText = exports.calculateItemPrice = exports.getSelectedVariantPrice = exports.getSelectedModifierPrices = exports.getPriceVariantOptions = exports.getLineItemModifiers = exports.getAreNotEnoughModifiersOfMandatoryModifierGroupInStock = exports.getModifierGroupErrors = exports.checkModifiersValidation = exports.getRuleTypeMapValue = exports.hasToChooseBetweenXAndY = exports.chooseUpToX = exports.hasToChooseAtLeastX = exports.hasToChooseAtLeastOne = exports.hasToChooseX = exports.hasToChooseOne = exports.canChooseOne = exports.hasNoLimit = exports.getModifierGroupRuleType = exports.convertModifierToFormModifier = exports.getPreSelectedModifiers = exports.getFirstPreSelectedModifier = exports.isSingleSelectRule = exports.getModifiersInitState = void 0;
+exports.getAvailabilityText = exports.calculateItemPrice = exports.getSelectedVariantPrice = exports.getSelectedModifierPrices = exports.getPriceVariantOptions = exports.getLineItemModifiers = exports.findModifierByFormId = exports.getAreNotEnoughModifiersOfMandatoryModifierGroupInStock = exports.getModifierGroupErrors = exports.checkModifiersValidation = exports.getRuleTypeMapValue = exports.hasToChooseBetweenXAndY = exports.chooseUpToX = exports.hasToChooseAtLeastX = exports.hasToChooseAtLeastOne = exports.hasToChooseX = exports.hasToChooseOne = exports.canChooseOne = exports.hasNoLimit = exports.getModifierGroupRuleType = exports.convertModifierToFormModifier = exports.getPreSelectedModifiers = exports.getFirstPreSelectedModifier = exports.isSingleSelectRule = exports.getModifiersInitState = void 0;
 const common_types_js_1 = require("./common-types.js");
 const getModifiersInitState = (modifierGroups, editingItemMode, editItemSelectedModifiers) => {
     const initialSelectedModifiers = {};
@@ -42,9 +42,13 @@ const getPreSelectedModifiers = (modifiers) => modifiers.reduce((acc, modifier)
 }, []);
 exports.getPreSelectedModifiers = getPreSelectedModifiers;
 const convertModifierToFormModifier = (modifier, index) => {
+    // Give each modifier a unique form id so duplicate-id modifiers stay
+    // distinct in the UI/selection state, while keeping the original id in
+    // `modifierId` so it can be read back without parsing the form id.
     return {
         ...modifier,
         _id: `${modifier._id}~${index}`,
+        modifierId: modifier._id,
     };
 };
 exports.convertModifierToFormModifier = convertModifierToFormModifier;
@@ -198,6 +202,17 @@ const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock = (modifierGroups)
     return isModifierGroupMandatory && !areMinimumRequiredModifiersInStock;
 });
 exports.getAreNotEnoughModifiersOfMandatoryModifierGroupInStock = getAreNotEnoughModifiersOfMandatoryModifierGroupInStock;
+// Resolve the selected modifier from a group. Selection state holds unique
+// form ids (`${_id}~${index}`, see convertModifierToFormModifier), so we match
+// the converted form modifiers by their unique `_id` — this keeps duplicate-id
+// modifiers distinct and avoids parsing the id. Falls back to matching the
+// original `modifierId` for edit-mode selections that are restored as base ids.
+const findModifierByFormId = (modifierGroup, selectedModifierId) => {
+    const formModifiers = modifierGroup?.modifiers.map(exports.convertModifierToFormModifier);
+    return (formModifiers?.find((mod) => mod._id === selectedModifierId) ??
+        formModifiers?.find((mod) => mod.modifierId === selectedModifierId));
+};
+exports.findModifierByFormId = findModifierByFormId;
 const getLineItemModifiers = (selectedModifiers, modifierGroups, formatCurrency) => {
     const modifierGroupsOptions = modifierGroups
         .map((modifierGroup) => {
@@ -207,13 +222,12 @@ const getLineItemModifiers = (selectedModifiers, modifierGroups, formatCurrency)
         }
         const modifiers = selectedModifierIds
             .map((modifierIdWithIndex) => {
-            const baseModifierId = modifierIdWithIndex.split('~')[0];
-            const modifier = modifierGroup.modifiers.find((mod) => mod._id === baseModifierId);
+            const modifier = (0, exports.findModifierByFormId)(modifierGroup, modifierIdWithIndex);
             if (!modifier)
                 return null;
             const price = Number(modifier?.additionalChargeInfo?.additionalCharge ?? 0);
             return {
-                id: modifier._id ?? '',
+                id: modifier.modifierId ?? '',
                 price: modifier?.additionalChargeInfo?.additionalCharge,
                 formattedPrice: price > 0 ? formatCurrency(price) : undefined,
             };
@@ -248,11 +262,9 @@ const getPriceVariantOptions = (selectedPriceVariant, formatCurrency) => {
 exports.getPriceVariantOptions = getPriceVariantOptions;
 const getSelectedModifierPrices = (selectedModifiers, modifierGroups) => {
     return Object.entries(selectedModifiers).reduce((total, [modifierGroupId, modifierIds]) => {
+        const group = modifierGroups.find((g) => g._id === modifierGroupId);
         const groupTotal = modifierIds.reduce((groupSum, modifierId) => {
-            const baseModifierId = modifierId.split('~')[0];
-            const modifier = modifierGroups
-                .find((group) => group._id === modifierGroupId)
-                ?.modifiers.find((mod) => mod._id === baseModifierId);
+            const modifier = (0, exports.findModifierByFormId)(group, modifierId);
             return (groupSum +
                 Number(modifier?.additionalChargeInfo?.additionalCharge ?? 0));
         }, 0);

package/dist/services/utils.d.ts

@@ -11,6 +11,7 @@ export declare const getFirstPreSelectedModifier: (modifiers: EnhancedModifier[]
 export declare const getPreSelectedModifiers: (modifiers: EnhancedModifier[]) => string[];
 export declare const convertModifierToFormModifier: (modifier: EnhancedModifier, index: number) => {
     _id: string;
+    modifierId: string | null | undefined;
     revision?: string | null;
     _createdDate?: Date | null;
     _updatedDate?: Date | null;
@@ -40,6 +41,22 @@ export declare const getModifierGroupErrors: (selectedModifiers: Record<string,
     hasError: boolean;
 };
 export declare const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock: (modifierGroups: EnhancedModifierGroup[]) => boolean;
+export declare const findModifierByFormId: (modifierGroup: EnhancedModifierGroup | undefined, selectedModifierId: string) => {
+    _id: string;
+    modifierId: string | null | undefined;
+    revision?: string | null;
+    _createdDate?: Date | null;
+    _updatedDate?: Date | null;
+    name?: string | null;
+    extendedFields?: import("@wix/auto_sdk_restaurants_item-modifiers").ExtendedFields;
+    inStock?: boolean | null;
+    businessLocationIds?: string[];
+    additionalChargeInfo?: {
+        additionalCharge?: string;
+        formattedAdditionalCharge?: string;
+    };
+    preSelected?: boolean;
+} | undefined;
 export declare const getLineItemModifiers: (selectedModifiers: Record<string, Array<string>>, modifierGroups: EnhancedModifierGroup[], formatCurrency: (price?: number) => string) => {
     id: string;
     modifiers: {

package/dist/services/utils.js

@@ -35,9 +35,13 @@ export const getPreSelectedModifiers = (modifiers) => modifiers.reduce((acc, mod
     return acc;
 }, []);
 export const convertModifierToFormModifier = (modifier, index) => {
+    // Give each modifier a unique form id so duplicate-id modifiers stay
+    // distinct in the UI/selection state, while keeping the original id in
+    // `modifierId` so it can be read back without parsing the form id.
     return {
         ...modifier,
         _id: `${modifier._id}~${index}`,
+        modifierId: modifier._id,
     };
 };
 export const getModifierGroupRuleType = (modifierGroupRule) => {
@@ -177,6 +181,16 @@ export const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock = (modifier
     const areMinimumRequiredModifiersInStock = inStockModifiers.length >= minimumRequiredModifiers;
     return isModifierGroupMandatory && !areMinimumRequiredModifiersInStock;
 });
+// Resolve the selected modifier from a group. Selection state holds unique
+// form ids (`${_id}~${index}`, see convertModifierToFormModifier), so we match
+// the converted form modifiers by their unique `_id` — this keeps duplicate-id
+// modifiers distinct and avoids parsing the id. Falls back to matching the
+// original `modifierId` for edit-mode selections that are restored as base ids.
+export const findModifierByFormId = (modifierGroup, selectedModifierId) => {
+    const formModifiers = modifierGroup?.modifiers.map(convertModifierToFormModifier);
+    return (formModifiers?.find((mod) => mod._id === selectedModifierId) ??
+        formModifiers?.find((mod) => mod.modifierId === selectedModifierId));
+};
 export const getLineItemModifiers = (selectedModifiers, modifierGroups, formatCurrency) => {
     const modifierGroupsOptions = modifierGroups
         .map((modifierGroup) => {
@@ -186,13 +200,12 @@ export const getLineItemModifiers = (selectedModifiers, modifierGroups, formatCu
         }
         const modifiers = selectedModifierIds
             .map((modifierIdWithIndex) => {
-            const baseModifierId = modifierIdWithIndex.split('~')[0];
-            const modifier = modifierGroup.modifiers.find((mod) => mod._id === baseModifierId);
+            const modifier = findModifierByFormId(modifierGroup, modifierIdWithIndex);
             if (!modifier)
                 return null;
             const price = Number(modifier?.additionalChargeInfo?.additionalCharge ?? 0);
             return {
-                id: modifier._id ?? '',
+                id: modifier.modifierId ?? '',
                 price: modifier?.additionalChargeInfo?.additionalCharge,
                 formattedPrice: price > 0 ? formatCurrency(price) : undefined,
             };
@@ -225,11 +238,9 @@ export const getPriceVariantOptions = (selectedPriceVariant, formatCurrency) =>
 };
 export const getSelectedModifierPrices = (selectedModifiers, modifierGroups) => {
     return Object.entries(selectedModifiers).reduce((total, [modifierGroupId, modifierIds]) => {
+        const group = modifierGroups.find((g) => g._id === modifierGroupId);
         const groupTotal = modifierIds.reduce((groupSum, modifierId) => {
-            const baseModifierId = modifierId.split('~')[0];
-            const modifier = modifierGroups
-                .find((group) => group._id === modifierGroupId)
-                ?.modifiers.find((mod) => mod._id === baseModifierId);
+            const modifier = findModifierByFormId(group, modifierId);
             return (groupSum +
                 Number(modifier?.additionalChargeInfo?.additionalCharge ?? 0));
         }, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/headless-restaurants-olo",
-  "version": "0.0.62",
+  "version": "0.0.63",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -81,5 +81,5 @@
       "groupId": "com.wixpress.headless-components"
     }
   },
-  "falconPackageHash": "805d8c5ecc7ef21b65074cd1880f383b6ded0ac85c3c8752fad83840"
+  "falconPackageHash": "7b2dc448774c9f7997e48a6683f7290b40c6ab6d0ced934655719da7"
 }