@riverbankcms/sdk 0.140.0 → 0.141.0

package/dist/client/bookings.mjs

@@ -8196,6 +8196,7 @@ z.object({
 	eventSurface: z.enum(eventSurfaceScopeValues).optional(),
 	eventPresets: z.string().optional(),
 	scheduleScope: z.enum(eventScheduleScopeValues).optional(),
+	seriesIds: z.string().optional(),
 	categoryIds: z.string().optional(),
 	venueId: z.string().transform(normalizeCalendarFilterId).optional(),
 	staffMemberId: z.string().transform(normalizeCalendarFilterId).optional()
@@ -10625,10 +10626,14 @@ function buildDiscountAvailabilityRequestPlan(options) {
 		}
 	};
 }
-function discountAvailabilityStateFromResponse(response) {
-	if (!discountAvailabilityHasDiscounts(response)) return { tag: "unavailable" };
+function discountAvailabilityStateFromResponse(requestKey, response) {
+	if (!discountAvailabilityHasDiscounts(response)) return {
+		tag: "unavailable",
+		requestKey
+	};
 	return {
 		tag: "available",
+		requestKey,
 		manualCodeEntryAllowed: discountAvailabilityAllowsManualEntry(response),
 		autoAppliedDiscount: getAutoAppliedDiscountPreview(response)
 	};
@@ -10638,10 +10643,13 @@ function discountCodeUiReducer(state, event) {
 		case "availability-disabled": return initialDiscountCodeUiState;
 		case "availability-loading": return {
 			...state,
-			availability: { tag: "loading" }
+			availability: {
+				tag: "loading",
+				previous: state.availability.tag === "available" || state.availability.tag === "unavailable" ? state.availability : state.availability.tag === "loading" ? state.availability.previous : null
+			}
 		};
 		case "availability-loaded": {
-			const availability = discountAvailabilityStateFromResponse(event.response);
+			const availability = discountAvailabilityStateFromResponse(event.requestKey, event.response);
 			if (availability.tag !== "available" || !availability.manualCodeEntryAllowed) return {
 				...state,
 				discountUiOpen: false,
@@ -10657,7 +10665,10 @@ function discountCodeUiReducer(state, event) {
 			...state,
 			discountUiOpen: false,
 			discountCode: "",
-			availability: { tag: "error" }
+			availability: {
+				tag: "error",
+				requestKey: event.requestKey
+			}
 		};
 		case "discount-code-changed": return {
 			...state,
@@ -10693,11 +10704,15 @@ function useDiscountCodeUi(options) {
 				if (cancelled) return;
 				dispatch({
 					type: "availability-loaded",
+					requestKey: requestPlan.key,
 					response: res
 				});
 			} catch {
 				if (cancelled) return;
-				dispatch({ type: "availability-failed" });
+				dispatch({
+					type: "availability-failed",
+					requestKey: requestPlan.key
+				});
 			}
 		}
 		checkDiscountAvailability();
@@ -10706,8 +10721,9 @@ function useDiscountCodeUi(options) {
 		};
 	}, [options.api, requestPlan]);
 	const availability = state.availability;
-	const isAvailable = availability.tag === "available";
-	const manualCodeEntryAllowed = isAvailable ? availability.manualCodeEntryAllowed : false;
+	const settledAvailability = availability.tag === "loading" ? availability.previous : availability.tag === "available" || availability.tag === "unavailable" ? availability : null;
+	const isAvailable = settledAvailability?.tag === "available";
+	const manualCodeEntryAllowed = isAvailable ? settledAvailability.manualCodeEntryAllowed : false;
 	return {
 		discountUiOpen: state.discountUiOpen,
 		setDiscountUiOpen: (isOpen) => dispatch({
@@ -10721,8 +10737,10 @@ function useDiscountCodeUi(options) {
 		}),
 		discountsAvailable: isAvailable,
 		manualCodeEntryAllowed,
-		autoAppliedDiscount: isAvailable ? availability.autoAppliedDiscount : null,
-		discountsAvailableLoading: availability.tag === "loading"
+		autoAppliedDiscount: isAvailable ? settledAvailability.autoAppliedDiscount : null,
+		discountsAvailableLoading: availability.tag === "loading",
+		discountAvailabilityRequestKey: requestPlan.key,
+		settledDiscountAvailabilityRequestKey: availability.tag === "error" ? availability.requestKey : settledAvailability?.requestKey ?? null
 	};
 }
 //#endregion
@@ -15249,6 +15267,7 @@ function hasValidPricingOptionSelection(input) {
 const initialEligibilityLookupState = {
 	tag: "idle",
 	eligibility: null,
+	settledRequestKey: null,
 	error: null
 };
 function eligibilityLookupReducer(state, action) {
@@ -15257,16 +15276,19 @@ function eligibilityLookupReducer(state, action) {
 		case "loading-started": return {
 			tag: "loading",
 			eligibility: state.eligibility,
+			settledRequestKey: state.settledRequestKey,
 			error: null
 		};
 		case "resolved": return {
 			tag: "resolved",
 			eligibility: action.eligibility,
+			settledRequestKey: action.requestKey,
 			error: null
 		};
 		case "failed": return {
 			tag: "failed",
 			eligibility: null,
+			settledRequestKey: null,
 			error: action.message
 		};
 		default: return assertNever(action);
@@ -15372,9 +15394,23 @@ function toRegistrationOptionsSubject(subject, attendanceMode) {
 function useEligibility(params) {
 	return useEligibilityWithDeps(params, eventRegistrationHooksDeps);
 }
+function eligibilityRequestKey(params) {
+	return JSON.stringify({
+		enabled: params.enabled,
+		refreshKey: params.refreshKey ?? 0,
+		subject: params.subject,
+		attendanceMode: params.attendanceMode ?? null,
+		ticketSelections: params.ticketSelectionsKey,
+		selectedSlidingAmount: params.selectedSlidingAmount ?? null
+	});
+}
 function useEligibilityWithDeps(params, deps) {
 	const api = deps.useBlockApi();
 	const ticketSelectionsKey = JSON.stringify(normalizeTicketSelectionLines(params.ticketSelections));
+	const requestKey = eligibilityRequestKey({
+		...params,
+		ticketSelectionsKey
+	});
 	const [state, dispatch] = useReducer(eligibilityLookupReducer, initialEligibilityLookupState);
 	const requestIdRef = useRef(0);
 	useEffect(() => {
@@ -15407,7 +15443,8 @@ function useEligibilityWithDeps(params, deps) {
 				if (cancelled || requestIdRef.current !== requestId) return;
 				dispatch({
 					type: "resolved",
-					eligibility: transformRegistrationOptionsResponse(result)
+					eligibility: transformRegistrationOptionsResponse(result),
+					requestKey
 				});
 			} catch {
 				if (cancelled || requestIdRef.current !== requestId) return;
@@ -15436,6 +15473,8 @@ function useEligibilityWithDeps(params, deps) {
 	return {
 		state,
 		eligibility: state.eligibility,
+		settledRequestKey: state.settledRequestKey,
+		requestKey,
 		isLoading: state.tag === "loading",
 		error: state.error,
 		creditState
@@ -16569,6 +16608,126 @@ function buildOccurrenceRegistrationRequest(options, prepared, method, passId, m
 	};
 }
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/registrationDerivations.ts
+function eventMatchesOccurrenceId(event, occurrenceId) {
+	return event.registrationSubject.kind === "occurrence" && (event.registrationSubject.occurrenceId === occurrenceId || event.selectionId === occurrenceId);
+}
+function findEventByOccurrenceId(events, occurrenceId) {
+	return events.find((event) => eventMatchesOccurrenceId(event, occurrenceId)) ?? null;
+}
+function findPreSelectedEvent(input) {
+	const occurrenceContext = input.occurrenceContext;
+	if (!occurrenceContext) return input.scopedEvents.length === 1 ? input.scopedEvents[0] ?? null : null;
+	const contextDate = getBookingLocalDateKey(toScheduledBookingDateTime({
+		startsAt: occurrenceContext.startsAt,
+		timeZone: occurrenceContext.timeZone
+	}));
+	return input.scopedEvents.find((event) => eventMatchesOccurrenceId(event, occurrenceContext.id) || getBookingLocalDateKey(toScheduledBookingDateTime({
+		startsAt: event.startsAt,
+		timeZone: event.timeZone
+	})) === contextDate) ?? null;
+}
+function resolveRegistrationTarget(input) {
+	const subject = input.occurrenceContext ? {
+		kind: "occurrence",
+		occurrenceId: input.occurrenceContext.id
+	} : input.selectedEvent?.registrationSubject ?? null;
+	if (!subject) return null;
+	return {
+		subject,
+		selectedEventId: input.selectedEvent?.selectionId ?? null
+	};
+}
+function resolveEventRequiresPayment(input) {
+	if (input.eligibility) return input.eligibility.requiresPayment;
+	if (input.selectedTicketType) return input.selectedTicketType.priceAmount > 0;
+	if (!input.event) return false;
+	return publicEventPricingType(input.event.pricing) === "paid";
+}
+function resolveDiscountContext(input) {
+	const selection = input.paymentSelection.method ? input.paymentSelection : null;
+	if (!input.event) return null;
+	if (selection?.method === "pass_bundle" && selection.bundlePassId) return {
+		type: "pass",
+		passId: selection.bundlePassId
+	};
+	if (selection?.method === "membership_bundle" && selection.bundleMembershipId) return {
+		type: "membership",
+		membershipId: selection.bundleMembershipId
+	};
+	if (!input.eventRequiresPayment) return null;
+	if (input.ticketsCount <= 0) return null;
+	if (selection?.method && selection.method !== "stripe") return null;
+	return {
+		type: "event",
+		eventSeriesId: input.event.seriesId,
+		eventCategoryId: input.event.eventCategory?.id ?? null,
+		ticketsCount: input.ticketsCount
+	};
+}
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/useSettledCommerceView.ts
+function buildCandidate(input) {
+	if (!input.eligibilityIsSettled || !input.eligibility || !input.currentEvent) return null;
+	return {
+		eventSelectionId: input.currentEvent.selectionId,
+		discountContext: resolveDiscountContext({
+			paymentSelection: input.paymentSelection,
+			event: input.currentEvent,
+			eventRequiresPayment: input.eventRequiresPayment,
+			ticketsCount: input.ticketsCount
+		}),
+		subtotalCents: input.eligibility.price,
+		summaryLines: input.eligibility.ticketLines.map((line) => ({
+			pricingOptionId: line.pricingOptionId,
+			label: line.label,
+			quantity: line.quantity,
+			unitPriceCents: line.unitPriceCents,
+			subtotalCents: line.subtotalCents
+		}))
+	};
+}
+function eligibilityIsSettled(result) {
+	return result.settledRequestKey === result.requestKey;
+}
+function viewIsStale(view, currentEvent, eligibilityState) {
+	return view.eventSelectionId !== currentEvent?.selectionId || eligibilityState?.tag === "failed" || eligibilityState?.tag === "idle";
+}
+function requestIsSettled(discountUi) {
+	return discountUi.discountAvailabilityRequestKey === "disabled" || discountUi.settledDiscountAvailabilityRequestKey === discountUi.discountAvailabilityRequestKey;
+}
+function discountRequest(view) {
+	const discountContext = view?.discountContext ?? null;
+	return {
+		discountContext,
+		subtotalCents: discountContext?.type === "event" && view?.subtotalCents !== null ? view?.subtotalCents : void 0
+	};
+}
+function useSettledCommerceView(input) {
+	const candidate = buildCandidate({
+		eligibilityIsSettled: eligibilityIsSettled(input.eligibilityResult),
+		eligibility: input.eligibility,
+		currentEvent: input.currentEvent,
+		paymentSelection: input.paymentSelection,
+		eventRequiresPayment: input.eventRequiresPayment,
+		ticketsCount: input.ticketsCount
+	});
+	const settledRef = useRef(candidate);
+	if (settledRef.current && viewIsStale(settledRef.current, input.currentEvent, input.eligibilityResult.state)) settledRef.current = null;
+	const requestView = candidate ?? settledRef.current;
+	const discountUi = input.useDiscountCodeUi({
+		api: input.api,
+		...discountRequest(requestView)
+	});
+	if (candidate && requestIsSettled(discountUi)) settledRef.current = candidate;
+	return {
+		discountUi,
+		discountContext: settledRef.current?.discountContext ?? null,
+		ticketSelectionSubtotalCents: settledRef.current?.subtotalCents ?? null,
+		ticketSelectionSummaryLines: settledRef.current?.summaryLines ?? []
+	};
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/eventPaymentOptions.ts
 function getApprovedDirectPaymentCollectionOptionKinds(paymentOptions) {
 	return paymentOptions.flatMap((option) => {
@@ -17210,64 +17369,6 @@ function getStepLabel(step) {
 	}
 }
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/event-registration/registrationDerivations.ts
-function eventMatchesOccurrenceId(event, occurrenceId) {
-	return event.registrationSubject.kind === "occurrence" && (event.registrationSubject.occurrenceId === occurrenceId || event.selectionId === occurrenceId);
-}
-function findEventByOccurrenceId(events, occurrenceId) {
-	return events.find((event) => eventMatchesOccurrenceId(event, occurrenceId)) ?? null;
-}
-function findPreSelectedEvent(input) {
-	const occurrenceContext = input.occurrenceContext;
-	if (!occurrenceContext) return input.scopedEvents.length === 1 ? input.scopedEvents[0] ?? null : null;
-	const contextDate = getBookingLocalDateKey(toScheduledBookingDateTime({
-		startsAt: occurrenceContext.startsAt,
-		timeZone: occurrenceContext.timeZone
-	}));
-	return input.scopedEvents.find((event) => eventMatchesOccurrenceId(event, occurrenceContext.id) || getBookingLocalDateKey(toScheduledBookingDateTime({
-		startsAt: event.startsAt,
-		timeZone: event.timeZone
-	})) === contextDate) ?? null;
-}
-function resolveRegistrationTarget(input) {
-	const subject = input.occurrenceContext ? {
-		kind: "occurrence",
-		occurrenceId: input.occurrenceContext.id
-	} : input.selectedEvent?.registrationSubject ?? null;
-	if (!subject) return null;
-	return {
-		subject,
-		selectedEventId: input.selectedEvent?.selectionId ?? null
-	};
-}
-function resolveEventRequiresPayment(input) {
-	if (input.eligibility) return input.eligibility.requiresPayment;
-	if (input.selectedTicketType) return input.selectedTicketType.priceAmount > 0;
-	if (!input.event) return false;
-	return publicEventPricingType(input.event.pricing) === "paid";
-}
-function resolveDiscountContext(input) {
-	const selection = input.paymentSelection.method ? input.paymentSelection : null;
-	if (!input.event) return null;
-	if (selection?.method === "pass_bundle" && selection.bundlePassId) return {
-		type: "pass",
-		passId: selection.bundlePassId
-	};
-	if (selection?.method === "membership_bundle" && selection.bundleMembershipId) return {
-		type: "membership",
-		membershipId: selection.bundleMembershipId
-	};
-	if (!input.eventRequiresPayment) return null;
-	if (input.ticketsCount <= 0) return null;
-	if (selection?.method && selection.method !== "stripe") return null;
-	return {
-		type: "event",
-		eventSeriesId: input.event.seriesId,
-		eventCategoryId: input.event.eventCategory?.id ?? null,
-		ticketsCount: input.ticketsCount
-	};
-}
-//#endregion
 //#region ../blocks/src/system/blocks/events/shared/runGrouping.ts
 function isWholeSeriesPublicEvent(event) {
 	return event.bookingScope === "whole_series";
@@ -17506,10 +17607,6 @@ function isSoldOutWithoutWaitlist(input) {
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/useEventRegistrationWizard.ts
-function resolveDiscountSubtotalCents(context, subtotalCents) {
-	if (context?.type !== "event" || subtotalCents === null) return void 0;
-	return subtotalCents;
-}
 function usesTieredPricing(event) {
 	return event !== null && event !== void 0 ? publicEventPricingStrategy(event.pricing) === "tiered" : false;
 }
@@ -17961,30 +18058,15 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		}
 		setStep("select-tickets");
 	};
-	const discountContext = useMemo(() => resolveDiscountContext({
-		paymentSelection,
-		event: currentEvent,
-		eventRequiresPayment,
-		ticketsCount
-	}), [
+	const { discountUi, discountContext, ticketSelectionSubtotalCents, ticketSelectionSummaryLines } = useSettledCommerceView({
+		api,
+		useDiscountCodeUi: deps.useDiscountCodeUi,
+		eligibilityResult,
+		eligibility,
 		currentEvent,
 		eventRequiresPayment,
 		paymentSelection,
 		ticketsCount
-	]);
-	const ticketSelectionSubtotalCents = eligibility?.price ?? null;
-	const ticketSelectionSummaryLines = useMemo(() => eligibility?.ticketLines.map((line) => ({
-		pricingOptionId: line.pricingOptionId,
-		label: line.label,
-		quantity: line.quantity,
-		unitPriceCents: line.unitPriceCents,
-		subtotalCents: line.subtotalCents
-	})) ?? [], [eligibility]);
-	const discountSubtotalCents = resolveDiscountSubtotalCents(discountContext, ticketSelectionSubtotalCents);
-	const discountUi = deps.useDiscountCodeUi({
-		api,
-		discountContext,
-		subtotalCents: discountSubtotalCents
 	});
 	const selectionMethod = paymentSelection.method;
 	const shouldShowDiscountToggle = discountContext !== null && discountUi.manualCodeEntryAllowed && (selectionMethod === "stripe" || selectionMethod === "pass_bundle" || selectionMethod === "membership_bundle");

package/dist/client/{carousel-DmkZRRq_.mjs → carousel-7VHGQARz.mjs}

@@ -1,4 +1,4 @@
-import { t as defineIslandPropsDecoder } from "./propsDecoder-CB2KS_ko.mjs";
+import { t as defineIslandPropsDecoder } from "./propsDecoder-zBdsnS-N.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
 import { n as normalizeCarouselProps, t as CarouselNodeClient } from "./carousel.client-DQTjCVQT.mjs";
 import "react";

package/dist/client/{cart-CIC24330.mjs → cart-Qg_mvQhh.mjs}

@@ -1,6 +1,6 @@
-import { t as defineIslandPropsDecoder } from "./propsDecoder-CB2KS_ko.mjs";
-import { t as CartController } from "./shop-commerce-BVTqipYp.mjs";
-import { t as mountShopBlockIsland } from "./shopShared-COIeK77T.mjs";
+import { t as defineIslandPropsDecoder } from "./propsDecoder-zBdsnS-N.mjs";
+import { t as CartController } from "./shop-commerce-D4KNGaW8.mjs";
+import { t as mountShopBlockIsland } from "./shopShared-DvJGdHTV.mjs";
 import "react";
 import { jsx } from "react/jsx-runtime";
 //#region ../blocks/src/system/runtime/nodes/cart.client.tsx

package/dist/client/{checkout-D1Zw9imo.mjs → checkout-D84rpgdr.mjs}

@@ -1,6 +1,6 @@
-import { t as defineIslandPropsDecoder } from "./propsDecoder-CB2KS_ko.mjs";
-import { n as CheckoutController } from "./shop-commerce-BVTqipYp.mjs";
-import { t as mountShopBlockIsland } from "./shopShared-COIeK77T.mjs";
+import { t as defineIslandPropsDecoder } from "./propsDecoder-zBdsnS-N.mjs";
+import { n as CheckoutController } from "./shop-commerce-D4KNGaW8.mjs";
+import { t as mountShopBlockIsland } from "./shopShared-DvJGdHTV.mjs";
 import "react";
 import { jsx } from "react/jsx-runtime";
 //#region ../blocks/src/system/runtime/nodes/checkout.client.tsx