@shopify/hydrogen 2026.10.0 → 2026.10.2

package/dist/development/core/cart/cart.mjs

@@ -203,13 +203,18 @@ function reuseVisibleReferences(previous, next) {
 		pending
 	};
 }
-function derivePending(state, transactions) {
+function getVisiblePendingKeys(store, transaction) {
+	if (transaction.type !== "change_lines_quantity") return transaction.pendingKeys;
+	const ownedKeys = getOwnedSignalKeys(store, transaction);
+	return transaction.pendingKeys.filter((key) => !transaction.signalKeys.includes(key) || ownedKeys.includes(key));
+}
+function derivePending(store, state) {
 	const lines = /* @__PURE__ */ new Set();
 	const discountCodes = /* @__PURE__ */ new Set();
 	let note = false;
 	let attributes = false;
 	let cost = false;
-	for (const transaction of transactions) for (const key of transaction.pendingKeys) {
+	for (const transaction of store.transactions) for (const key of getVisiblePendingKeys(store, transaction)) {
 		if (key === NOTE_KEY) note = true;
 		if (key === ATTRIBUTES_KEY) attributes = true;
 		if (key.startsWith(LINE_KEY_PREFIX)) {
@@ -236,10 +241,13 @@ function derivePending(state, transactions) {
 }
 function projectVisibleState(store) {
 	let state = store.settled;
-	for (const transaction of store.transactions) state = transaction.projectPayload(state);
+	for (const transaction of store.transactions) {
+		const ownedKeys = getOwnedSignalKeys(store, transaction);
+		state = transaction.projectPayload(state, (key) => ownedKeys.includes(key));
+	}
 	state = {
 		...state,
-		pending: derivePending(state, store.transactions)
+		pending: derivePending(store, state)
 	};
 	for (const error of store.projectedErrors) state = error.project(state);
 	if (store.revalidation.visible) state = {
@@ -288,9 +296,9 @@ function createOwner(store, keys) {
 	}
 	return owner;
 }
-function ownsSignalKeys(store, transaction) {
-	if (!transaction.owner) return true;
-	return transaction.signalKeys.every((key) => store.keyedOwners.get(key)?.token === transaction.owner?.token);
+function getOwnedSignalKeys(store, transaction) {
+	if (!transaction.owner) return transaction.signalKeys;
+	return transaction.signalKeys.filter((key) => store.keyedOwners.get(key)?.token === transaction.owner?.token);
 }
 function releaseSignalKeys(store, transaction) {
 	if (!transaction.owner) return;
@@ -413,7 +421,9 @@ function writeNetworkError(state, error, timestampMs) {
 }
 function projectLineErrors(state, failure, lineIds, timestampMs) {
 	if (!failure) return state;
-	const grouped = groupLineErrors(failure, lineIds);
+	return writeLineErrors(state, groupLineErrors(failure, lineIds), timestampMs);
+}
+function writeLineErrors(state, grouped, timestampMs) {
 	return {
 		...state,
 		errors: {
@@ -567,6 +577,22 @@ function mergeServerLine(previous, next) {
 		...merchandise ? { merchandise } : {}
 	};
 }
+function addOwnedLineErrors(failure, lineIds, ownedLineIds, addError) {
+	const grouped = groupLineErrors(failure, lineIds);
+	for (const [lineId, group] of grouped.lines) {
+		if (lineIds.includes(lineId) && !ownedLineIds.has(lineId)) continue;
+		const lines = new Map([[lineId, group]]);
+		addError((current, timestampMs) => writeLineErrors(current, {
+			lines,
+			cart: createEmptyErrorGroup()
+		}, timestampMs), [lineKey(lineId)]);
+	}
+	if (grouped.cart.userErrors.length === 0 && grouped.cart.warnings.length === 0) return;
+	addError((current, timestampMs) => writeLineErrors(current, {
+		lines: /* @__PURE__ */ new Map(),
+		cart: grouped.cart
+	}, timestampMs), [...ownedLineIds].map(lineKey));
+}
 function hasProjectedErrors(result) {
 	return (result?.userErrors?.length ?? 0) > 0 || (result?.warnings?.length ?? 0) > 0;
 }
@@ -579,6 +605,31 @@ function transportAddToCart(payload, signal, updateCart, cartId) {
 		...payload.eventDetail && { event: { detail: payload.eventDetail } }
 	});
 }
+function projectLineQuantity(state, payload) {
+	const previous = getLines(state.data);
+	if (!previous.some((line) => line.id === payload.lineId)) return state;
+	const lines = payload.quantity === 0 ? previous.filter((line) => line.id !== payload.lineId) : previous.map((line) => line.id === payload.lineId ? {
+		...line,
+		quantity: payload.quantity
+	} : line);
+	return {
+		...state,
+		data: reconcileCartLines(state.data, lines)
+	};
+}
+function settleLineQuantity(state, serverLines, payload, requestRevalidation) {
+	const previous = getLines(state.data);
+	const matching = serverLines.find((line) => line.id === payload.lineId);
+	if (!matching && payload.quantity > 0) {
+		requestRevalidation();
+		return state;
+	}
+	const lines = matching ? previous.map((line) => line.id === payload.lineId ? mergeServerLine(line, matching) : line) : previous.filter((line) => line.id !== payload.lineId);
+	return {
+		...state,
+		data: reconcileCartLines(state.data, lines)
+	};
+}
 const CART_TRANSACTION_TYPES = defineTransactionTypes({
 	add_to_cart: {
 		payload: {},
@@ -702,6 +753,22 @@ const CART_TRANSACTION_TYPES = defineTransactionTypes({
 		},
 		getSignalKeys: (_state, payload) => lineKey(payload.lineId)
 	},
+	change_lines_quantity: {
+		payload: {},
+		transport: (payload, signal, updateCart) => updateCart({ lines: payload.lines.map(({ lineId, quantity }) => ({
+			id: lineId,
+			quantity
+		})) }, { signal }),
+		projectPayload: (state, payload, ownsKey) => payload.lines.filter(({ lineId }) => ownsKey(lineKey(lineId))).reduce(projectLineQuantity, state),
+		projectPromise: (state, result, payload, addError, { ownsKey, requestRevalidation }) => {
+			const owned = payload.lines.filter(({ lineId }) => ownsKey(lineKey(lineId)));
+			if (hasProjectedErrors(result)) addOwnedLineErrors(result, payload.lines.map(({ lineId }) => lineId), new Set(owned.map(({ lineId }) => lineId)), addError);
+			if (!result.cart) return state;
+			const serverLines = getLines(cartResponseFromStandardEvent(result.cart));
+			return owned.reduce((current, line) => settleLineQuantity(current, serverLines, line, requestRevalidation), state);
+		},
+		getSignalKeys: (_state, payload) => payload.lines.map(({ lineId }) => lineKey(lineId))
+	},
 	set_discount_codes: {
 		payload: {},
 		transport: (payload, signal, updateCart) => updateCart({ discountCodes: payload.discountCodes }, { signal }),
@@ -844,8 +911,12 @@ function createPendingTransaction(store, type, definition, payload, promise, res
 		requiresRevalidation,
 		owner,
 		promise,
-		projectPayload: (current) => definition.projectPayload(current, payload),
-		projectPromise: (current, result, addError) => definition.projectPromise(current, result, payload, addError, { mergeServerCart: !transaction.requiresRevalidation }),
+		projectPayload: (current, ownsKey) => definition.projectPayload(current, payload, ownsKey),
+		projectPromise: (current, result, addError, ownsKey, requestRevalidation) => definition.projectPromise(current, result, payload, addError, {
+			mergeServerCart: !transaction.requiresRevalidation,
+			ownsKey,
+			requestRevalidation
+		}),
 		trimAfter: (successful) => trimPendingTransaction(store, type, definition, payload, promise, {
 			id,
 			sequence,
@@ -915,15 +986,16 @@ function fulfillTransaction(store, transactionId, result) {
 	const transaction = store.transactions.find((candidate) => candidate.id === transactionId);
 	if (!transaction || transaction.generation !== store.generation) return;
 	store.observedPromises.delete(transaction.promise);
-	if (!ownsSignalKeys(store, transaction)) {
+	const ownedKeys = getOwnedSignalKeys(store, transaction);
+	if (ownedKeys.length === 0 && transaction.signalKeys.length > 0) {
 		removeTransaction(store, transactionId);
 		publishVisibleState(store);
 		revalidateCartWhenIdle(store);
 		return;
 	}
-	store.settled = transaction.projectPromise(store.settled, result, (projector, keys) => addProjectedError(store, keys ?? transaction.errorKeys, projector));
+	store.settled = transaction.projectPromise(store.settled, result, (projector, keys) => addProjectedError(store, keys ?? transaction.errorKeys, projector), (key) => ownedKeys.includes(key), () => requestCartRevalidation(store));
 	store.settled = addSnapshotIdentity(store.settled, result);
-	if (result.cart && !transaction.requiresRevalidation && transaction.sequence >= store.lastSnapshotSequence) {
+	if (result.cart && ownedKeys.length === transaction.signalKeys.length && !transaction.requiresRevalidation && transaction.sequence >= store.lastSnapshotSequence) {
 		store.settled = addSnapshotFields(store.settled, result);
 		store.lastSnapshotSequence = transaction.sequence;
 	}
@@ -943,13 +1015,14 @@ function rejectTransaction(store, transactionId, error) {
 	const transaction = store.transactions.find((candidate) => candidate.id === transactionId);
 	if (!transaction || transaction.generation !== store.generation) return;
 	store.observedPromises.delete(transaction.promise);
-	const owned = ownsSignalKeys(store, transaction);
+	const ownedKeys = getOwnedSignalKeys(store, transaction);
+	const ownsAllKeys = ownedKeys.length === transaction.signalKeys.length;
 	removeTransaction(store, transactionId);
 	releaseSignalKeys(store, transaction);
-	if (owned) {
+	if (ownedKeys.length > 0 || ownsAllKeys) {
 		const failure = extractCartActionFailure(error);
-		if (failure) transaction.projectPromise(store.settled, rejectedResult(failure), (projector, keys) => addProjectedError(store, keys ?? transaction.errorKeys, projector));
-		if (!failure && !isAbortError(error)) addProjectedError(store, transaction.errorKeys, (state, timestampMs) => writeNetworkError(state, error, timestampMs));
+		if (failure) transaction.projectPromise(store.settled, rejectedResult(failure), (projector, keys) => addProjectedError(store, keys ?? transaction.errorKeys, projector), (key) => ownedKeys.includes(key), NOOP);
+		if (!failure && !isAbortError(error)) addProjectedError(store, ownsAllKeys ? transaction.errorKeys : ownedKeys, (state, timestampMs) => writeNetworkError(state, error, timestampMs));
 	}
 	publishVisibleState(store);
 	revalidateCartWhenIdle(store);
@@ -980,7 +1053,11 @@ function enqueueTransaction(store, type, payload, promise, reservedTransaction,
 	promise.then((result) => fulfillTransaction(store, transaction.id, result), (error) => rejectTransaction(store, transaction.id, error));
 }
 function markOverlappingTransactionForRevalidation(store, transaction) {
-	if (store.transactions.length === 0 && !store.revalidation.active && store.activeMutationTransports.size === 0) return;
+	if (store.transactions.length === 0 && !store.revalidation.active && store.activeMutationTransports.size === 0 && !store.activeCartLoad) return;
+	if (store.activeCartLoad) store.settled = {
+		...store.settled,
+		loading: false
+	};
 	transaction.requiresRevalidation = true;
 	for (const pending of store.transactions) pending.requiresRevalidation = true;
 	requestCartRevalidation(store);
@@ -1173,12 +1250,16 @@ function handleLinesEvent(store, event) {
 		enqueueTransaction(store, "add_to_cart", payloadFromAddEvent(event), event.promise, void 0, eventToken);
 		return;
 	}
-	if (event.lines.length !== 1) return;
-	const line = event.lines[0];
-	enqueueTransaction(store, "change_line_quantity", {
+	const lines = event.lines.map((line) => ({
 		lineId: line.id,
 		quantity: line.quantity
-	}, event.promise, void 0, eventToken);
+	}));
+	if (lines.length === 0) return;
+	if (lines.length === 1) {
+		enqueueTransaction(store, "change_line_quantity", lines[0], event.promise, void 0, eventToken);
+		return;
+	}
+	enqueueTransaction(store, "change_lines_quantity", { lines }, event.promise, void 0, eventToken);
 }
 function handleDiscountEvent(store, event) {
 	enqueueTransaction(store, "set_discount_codes", { discountCodes: event.discountCodes.map((discount) => discount.code) }, event.promise, void 0, getTransactionEventToken(event.detail));
@@ -1201,6 +1282,10 @@ function connectCartStore(store, handlers) {
 	document.addEventListener("shopify:cart:note-update", handlers.note);
 	document.addEventListener("shopify:cart:attributes-update", handlers.attributes);
 	getShopifyStandardActions().catch(() => {});
+	if (store.revalidateOnConnect) {
+		store.revalidateOnConnect = false;
+		refreshCartInStore(store);
+	}
 	return true;
 }
 function cancelCartRevalidation(store) {
@@ -1218,7 +1303,6 @@ function clearPendingTransactions(store) {
 	store.transactions = [];
 	store.projectedErrors = [];
 	store.observedPromises.clear();
-	store.activeMutationTransports.clear();
 	store.expectedEvents = [];
 	store.reservation = null;
 	store.identityTransportGate.active = null;
@@ -1227,6 +1311,7 @@ function clearPendingTransactions(store) {
 	cancelCartRevalidation(store);
 }
 function destroyCartStore(store, handlers) {
+	store.revalidateOnConnect ||= store.revalidation.requested || store.revalidation.active !== null;
 	clearPendingTransactions(store);
 	if (typeof document !== "undefined" && store.cartSyncAttached) {
 		document.removeEventListener("shopify:cart:lines-update", handlers.lines);
@@ -1323,6 +1408,7 @@ function resetCartStore(store) {
 	const hadActiveRevalidation = store.revalidation.active !== null;
 	const shouldReloadAfterReset = store.cartSyncAttached && !hadActiveRevalidation && (hadActiveCartLoad || hasLocalCartData(store.observable.state));
 	clearPendingTransactions(store);
+	store.activeMutationTransports.clear();
 	invalidateActiveCartLoad(store);
 	cancelCartRevalidation(store);
 	store.lastSnapshotSequence = 0;
@@ -1435,6 +1521,7 @@ function createCartStore(options = {}) {
 			waiting: []
 		},
 		cartSyncAttached: false,
+		revalidateOnConnect: false,
 		reservation: null,
 		lastSnapshotSequence: 0
 	};