@fire-spark/core 0.12.4 → 0.12.5

package/dist/index.d.ts

@@ -941,6 +941,7 @@ declare const capRedeems: <T extends CapOrder>(order: T) => T & {
     id: string;
     parent_uid: string | null;
     parent_id: string | null;
+    group_id?: string | undefined;
     name: string;
     image_url?: string | undefined;
     menu_id?: string | undefined;

package/dist/index.js

@@ -1415,9 +1415,11 @@ const flattenMenuCategories = (categories, categoriesById, options) => {
 //#endregion
 //#region src/productCustomization/fromOrderLines.ts
 /** Group slot of a child line: listed directly, or as the variant of a base
-* listed in one of the parent's modifier groups. */
-const matchModifierLine = (lookup, parent, childId) => {
+* listed in one of the parent's modifier groups. With `onlyGroupId` (the
+* line's declared `group_id`) only that group of this parent is searched. */
+const matchModifierLine = (lookup, parent, childId, onlyGroupId) => {
 	const groups = parent.pricing.modifier_group_ids.flatMap((groupId) => {
+		if (onlyGroupId !== void 0 && groupId !== onlyGroupId) return [];
 		const group = lookup.modifierGroupsById[groupId];
 		return group ? [group] : [];
 	});
@@ -1463,7 +1465,13 @@ const fromOrderLines = (root, lines, lookup) => {
 		const parentProduct = lookup.productsById[parentLine.id];
 		if (!parentProduct) return;
 		for (const child of childrenByParent.get(parentLine.uid) ?? []) {
-			const match = matchModifierLine(lookup, parentProduct, child.id);
+			const p = [
+				lookup,
+				parentProduct,
+				child.id,
+				child.group_id
+			];
+			const match = matchModifierLine(...p);
 			if (!match) continue;
 			const { groupId, modifierId, selection } = match;
 			const path = `${pathPrefix}/group/${groupId}/modifier/${modifierId}`;
@@ -1750,6 +1758,7 @@ const buildLine = (args) => {
 		name: args.name
 	};
 	const r4 = {
+		...args.group_id ? { group_id: args.group_id } : {},
 		...imagePatch,
 		...catalog
 	};
@@ -1835,7 +1844,8 @@ const appendModifierLine = (modifier, groupId, parent, locale) => {
 	const line = buildLine({
 		...l1,
 		...l2,
-		...l3
+		...l3,
+		group_id: groupId
 	});
 	parent.children.push(line);
 	if (modifier.product) appendGroupLines(modifier.product.groups, line, locale);
@@ -3687,7 +3697,8 @@ const computeLineFingerprint = (root, lines) => {
 		const keys = lines.filter((line) => {
 			return line.parent_uid === parentUid;
 		}).map((line) => {
-			return `${line.id}x${line.quantity}(${childKeys(line.uid)})`;
+			const slot = line.group_id ? `@${line.group_id}` : "";
+			return `${line.id}${slot}x${line.quantity}(${childKeys(line.uid)})`;
 		});
 		keys.sort((left, right) => left.localeCompare(right));
 		return keys.join(",");
@@ -6643,7 +6654,8 @@ const selectionKey = (line, kidsOf, cache) => {
 		return selectionKey(child, kidsOf, cache);
 	});
 	nested.sort((left, right) => left.localeCompare(right));
-	const key = `${line.id}x${line.quantity}(${nested.join(",")})`;
+	const slot = line.group_id ? `@${line.group_id}` : "";
+	const key = `${line.id}${slot}x${line.quantity}(${nested.join(",")})`;
 	cache.set(line.uid, key);
 	return key;
 };
@@ -6730,6 +6742,36 @@ const hasRepeatedProductSibling = (lines, rootUid) => {
 	};
 	return walk(rootUid);
 };
+/** A line whose product the parent's menu lists in more than one slot, at
+* any depth. Cart lines carry no group id, so the slot is chosen by
+* `placeCartLines`; with a single listing the session path is unambiguous. */
+const hasMultiSlotChild = (lines, rootUid, lookup) => {
+	const kidsOf = /* @__PURE__ */ new Map();
+	for (const line of lines) {
+		if (line.parent_uid == null) continue;
+		const list = kidsOf.get(line.parent_uid) ?? [];
+		list.push(line);
+		kidsOf.set(line.parent_uid, list);
+	}
+	const walk = (line) => {
+		const parent = lookup.productsById[line.id];
+		const groups = parent ? parentGroups(lookup, parent) : [];
+		for (const kid of kidsOf.get(line.uid) ?? []) {
+			const ids = listingsFor(lookup, groups, kid.id).map((row) => slotKey(row.group.id, row.modifierId));
+			if (new Set(ids).size > 1) return true;
+			if (walk(kid)) return true;
+		}
+		return false;
+	};
+	const root = lines.find((line) => line.uid === rootUid);
+	return root ? walk(root) : false;
+};
+/** Cart shapes the slot search must place: a repeated sibling product, or
+* a product listed in several slots. Everything else keeps the session. */
+const needsSlotPlacement = (lines, rootUid, lookup) => {
+	if (hasRepeatedProductSibling(lines, rootUid)) return true;
+	return hasMultiSlotChild(lines, rootUid, lookup);
+};
 const noteRules = (state, broken) => {
 	if (broken) state.rulesBroken = true;
 };
@@ -6897,13 +6939,21 @@ const greedyAssignment = (plans) => {
 		overCapacity
 	};
 };
+/** The groups a line may sit in under this parent: only its declared
+* `group_id` when it names one, else every group of the parent. A declared id
+* the parent does not own leaves none, so the line is never placed. */
+const groupsDeclared = (groups, line) => {
+	if (line.group_id === void 0) return groups;
+	return groups.filter((group) => group.id === line.group_id);
+};
 const planKids = (lookup, groups, byKey, kids, prefix, state) => {
 	const plans = [];
 	let previous = "";
 	for (const child of kids) {
 		if (pathVisits(prefix, child.id)) continue;
 		const ordered = lookup.productsById[child.id];
-		const listings = listingsFor(lookup, groups, child.id);
+		const scope = groupsDeclared(groups, child);
+		const listings = listingsFor(lookup, scope, child.id);
 		if (!ordered || listings.length === 0) continue;
 		const listed = [];
 		for (const item of listings) {
@@ -7123,14 +7173,17 @@ const emit = (node, parentUid, parentId, locale, out) => {
 		type: "PRODUCT",
 		uid: randomUUID()
 	};
+	const id = node.product.id;
+	const groupPatch = node.group ? { group_id: node.group.id } : {};
 	const r2 = {
-		id: node.product.id,
+		id,
 		parent_uid: parentUid,
 		parent_id: parentId
 	};
 	const r3 = {
 		name: displayName(node.product.name, locale),
-		quantity: node.quantity
+		quantity: node.quantity,
+		...groupPatch
 	};
 	const r4 = {
 		redeem: [],
@@ -7321,10 +7374,25 @@ const childrenOf = (lines, parentUid) => {
 		if (byShape !== 0) return byShape;
 		const bySubtotal = new Big(a.unit_subtotal).cmp(b.unit_subtotal);
 		if (bySubtotal !== 0) return bySubtotal;
-		return new Big(a.unit_tax_total).cmp(b.unit_tax_total);
+		const byTax = new Big(a.unit_tax_total).cmp(b.unit_tax_total);
+		if (byTax !== 0) return byTax;
+		return (a.group_id ?? "").localeCompare(b.group_id ?? "");
 	});
 	return children;
 };
+/** A declared `group_id` that the parent's menu does not back (unknown under
+* this parent, or it does not hold the product) names the field; a line that
+* is no modifier of its parent at all keeps the plain code. */
+const notFoundIssue = (lookup, parent, child) => {
+	const code = "MODIFIER_NOT_FOUND";
+	if (child.group_id === void 0) return { code };
+	if (!matchModifierLine(lookup, parent, child.id)) return { code };
+	return {
+		code,
+		field: "group_id",
+		actual: child.group_id
+	};
+};
 const collectUnmatchedModifiers = (lines, lookup, parentProductId, parentUid, out) => {
 	const parent = lookup.productsById[parentProductId];
 	if (!parent) return;
@@ -7336,9 +7404,14 @@ const collectUnmatchedModifiers = (lines, lookup, parentProductId, parentUid, ou
 			pushLineIssue(out, child.uid, { code: "VARIANT_BASE_NOT_ORDERABLE" });
 			continue;
 		}
-		const match = matchModifierLine(lookup, parent, child.id);
+		const match = matchModifierLine(...[
+			lookup,
+			parent,
+			child.id,
+			child.group_id
+		]);
 		if (!match) {
-			pushLineIssue(out, child.uid, { code: "MODIFIER_NOT_FOUND" });
+			pushLineIssue(out, child.uid, notFoundIssue(lookup, parent, child));
 			continue;
 		}
 		const base = lookup.productsById[match.modifierId];
@@ -7481,6 +7554,13 @@ const compareTrees = (actualLines, expectedLines, actualUid, expectedUid, out) =
 		});
 		return;
 	}
+	const declared = actual.group_id;
+	if (declared !== void 0 && declared !== expected.group_id) pushLineIssue(out, actual.uid, {
+		code: "STRUCTURE_MISMATCH",
+		field: "group_id",
+		expected: expected.group_id,
+		actual: declared
+	});
 	if (actual.quantity !== expected.quantity) pushLineIssue(out, actual.uid, {
 		code: "QUANTITY_MISMATCH",
 		field: "quantity",
@@ -7566,7 +7646,7 @@ const validateProductRoot = (root, lines, lookup, locale, out) => {
 	if (!isOnSchedule(product.availability.schedules)) pushLineIssue(out, root.uid, { code: "OUTSIDE_HOURS" });
 	collectUnmatchedModifiers(lines, lookup, root.id, root.uid, out);
 	let expected;
-	if (hasRepeatedProductSibling(lines, root.uid)) {
+	if (needsSlotPlacement(lines, root.uid, lookup)) {
 		const placed = placeCartLines(root, lines, lookup, locale);
 		if (placed.rulesBroken) pushLineIssue(out, root.uid, { code: "MODIFIER_RULES_INVALID" });
 		expected = placed.lines;
@@ -7898,7 +7978,7 @@ const collectOrderLineDiffs = (input) => {
 			continue;
 		}
 		try {
-			if (hasRepeatedProductSibling(input.lines, root.uid)) {
+			if (needsSlotPlacement(input.lines, root.uid, lookup)) {
 				const placed = placeCartLines(root, input.lines, lookup, locale);
 				const next = placed.rulesBroken ? null : placed.lines;
 				diffs.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fire-spark/core",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "description": "Fire Spark headless SDK",
   "type": "module",
   "sideEffects": false,
@@ -20,8 +20,8 @@
     "big.js": "6.2.1",
     "dayjs": "1.11.9",
     "@types/big.js": "6.2.2",
-    "@fire-spark/payments": "^0.12.4",
-    "@fire-spark/types": "^0.12.4"
+    "@fire-spark/payments": "^0.12.5",
+    "@fire-spark/types": "^0.12.5"
   },
   "devDependencies": {
     "tsdown": "^0.22.14",