@riverbankcms/sdk 0.138.0 → 0.139.0

package/dist/server/page-converter.mjs

@@ -5404,7 +5404,7 @@ const boxBackgroundSchema = z.discriminatedUnion("type", [
 	})
 ]);
 function normalizeAuthoringOpacity(value) {
-	if (!isRecord$6(value)) return value;
+	if (!isRecord$9(value)) return value;
 	return {
 		...value,
 		opacity: normalizeOpacity(value.opacity)
@@ -5413,7 +5413,7 @@ function normalizeAuthoringOpacity(value) {
 function normalizeOpacity(value) {
 	return typeof value === "number" && value > 1 && value <= 100 ? value / 100 : value;
 }
-function isRecord$6(value) {
+function isRecord$9(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -10973,12 +10973,12 @@ function err(error) {
 }
 //#endregion
 //#region ../core/src/branded.ts
-const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const UUID_PATTERN$1 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function parseUuidBrand(value, unsafeConstructor) {
 	if (typeof value !== "string") return err({ kind: "not_string" });
 	const normalized = value.trim().toLowerCase();
 	if (normalized.length === 0) return err({ kind: "empty_string" });
-	if (!UUID_PATTERN.test(normalized)) return err({ kind: "invalid_uuid" });
+	if (!UUID_PATTERN$1.test(normalized)) return err({ kind: "invalid_uuid" });
 	return ok(unsafeConstructor(normalized));
 }
 const unsafeAsEventOfferingId = (id) => id;
@@ -11217,7 +11217,7 @@ function parseEventPageSurfaceDestinationMode(value) {
 	return value === "cms-managed" || value === "system-managed" ? value : void 0;
 }
 function parseEventPageSurfaceSubject(value) {
-	if (!isRecord$5(value)) return err({ kind: "notObject" });
+	if (!isRecord$8(value)) return err({ kind: "notObject" });
 	switch (value.kind) {
 		case "eventSeries": {
 			const eventSeriesId = parseEventSeriesId(value.eventSeriesId);
@@ -11272,7 +11272,7 @@ function parseEventSeriesIdList(values) {
 	}
 	return ok(parsed);
 }
-function isRecord$5(value) {
+function isRecord$8(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -11442,9 +11442,379 @@ function toLocationCoordinates(value) {
 	};
 }
 //#endregion
-//#region ../core/src/newsletter-signup-destination.ts
-function parseNewsletterSignupDestinationProvider(value) {
-	return value === "riverbank" || value === "mailchimp" ? value : null;
+//#region ../core/src/mailing-list-identifiers.ts
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
+const OPAQUE_ID_PATTERN = /^[A-Za-z0-9_-]{1,100}$/u;
+function parseTrimmedMatchingString(value, pattern) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return pattern.test(trimmed) ? trimmed : null;
+}
+function parsePositiveInteger(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : null;
+}
+function parseNewsletterListId(value) {
+	return parseTrimmedMatchingString(value, UUID_PATTERN);
+}
+function parseMailchimpAudienceId(value) {
+	return parseTrimmedMatchingString(value, OPAQUE_ID_PATTERN);
+}
+function parseMailchimpInterestId(value) {
+	return parseTrimmedMatchingString(value, OPAQUE_ID_PATTERN);
+}
+function parseBrevoListId(value) {
+	return parsePositiveInteger(value);
+}
+//#endregion
+//#region ../core/src/mailing-list-setup-parser.ts
+function parseMailingListGlobalForm(value) {
+	if (!isRecord$7(value)) return formError("shape");
+	const fields = parseGlobalFields(value.fields);
+	if (fields === null) return formError("fields");
+	if (typeof value.includeOptionalPhone !== "boolean") return formError("includeOptionalPhone");
+	const buttonLabel = parseRequiredString(value.buttonLabel);
+	if (buttonLabel === null) return formError("buttonLabel");
+	const privacyNote = parseOptionalString(value.privacyNote);
+	if (privacyNote === void 0) return formError("privacyNote");
+	return ok({
+		fields,
+		includeOptionalPhone: value.includeOptionalPhone,
+		buttonLabel,
+		privacyNote
+	});
+}
+function parseGlobalFields(value) {
+	if (!isRecord$7(value) || typeof value.preset !== "string") return null;
+	switch (value.preset) {
+		case "emailOnly": return { preset: "emailOnly" };
+		case "emailName": return isRequirement(value.name) ? {
+			preset: "emailName",
+			name: value.name
+		} : null;
+		case "emailFirstLast": return isRequirement(value.firstName) && isRequirement(value.lastName) ? {
+			preset: "emailFirstLast",
+			firstName: value.firstName,
+			lastName: value.lastName
+		} : null;
+		case "emailNameCompany": return isRequirement(value.name) && isRequirement(value.company) ? {
+			preset: "emailNameCompany",
+			name: value.name,
+			company: value.company
+		} : null;
+		default: return null;
+	}
+}
+function parseMailingListSetupRevision(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : null;
+}
+function parseRequiredString(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function parseOptionalString(value) {
+	if (value === null || value === void 0) return null;
+	if (typeof value !== "string") return void 0;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function isRequirement(value) {
+	return value === "required" || value === "optional";
+}
+function isRecord$7(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function formError(field) {
+	return err({
+		tag: "invalid_mailing_list_global_form",
+		field
+	});
+}
+//#endregion
+//#region ../core/src/mailing-list-targeting.ts
+function planMailingListChoicePresentation(targeting) {
+	if (targeting.mode === "default" || targeting.selection.tag === "fixed") return { tag: "hidden" };
+	switch (targeting.provider) {
+		case "native": return targeting.selection.offeredTopicIds.length === 1 ? {
+			tag: "automatic",
+			selection: {
+				provider: "native",
+				topicIds: targeting.selection.offeredTopicIds
+			}
+		} : {
+			tag: "visitor_choice",
+			provider: "native",
+			optionCount: targeting.selection.offeredTopicIds.length
+		};
+		case "brevo": return targeting.selection.offeredListIds.length === 1 ? {
+			tag: "automatic",
+			selection: {
+				provider: "brevo",
+				listIds: targeting.selection.offeredListIds
+			}
+		} : {
+			tag: "visitor_choice",
+			provider: "brevo",
+			optionCount: targeting.selection.offeredListIds.length
+		};
+		case "mailchimp": return targeting.selection.offeredInterestIds.length === 1 ? {
+			tag: "automatic",
+			selection: {
+				provider: "mailchimp",
+				interestIds: targeting.selection.offeredInterestIds
+			}
+		} : {
+			tag: "visitor_choice",
+			provider: "mailchimp",
+			optionCount: targeting.selection.offeredInterestIds.length
+		};
+	}
+}
+//#endregion
+//#region ../core/src/mailing-list-runtime.ts
+function parseMailingListRuntimeContext(value) {
+	if (!isRecord$6(value)) return invalidRuntimeContext();
+	if (value.tag === "not_configured") return ok({ tag: "not_configured" });
+	if (value.tag !== "configured") return invalidRuntimeContext();
+	const revision = parseMailingListSetupRevision(value.revision);
+	const form = parseMailingListGlobalForm(value.form);
+	const provider = parseRuntimeProvider(value.provider);
+	if (revision === null || !form.ok || provider === null) return invalidRuntimeContext();
+	return ok({
+		tag: "configured",
+		revision,
+		form: form.value,
+		provider
+	});
+}
+function parseRuntimeProvider(value) {
+	if (!isRecord$6(value)) return null;
+	switch (value.provider) {
+		case "native": return parseNativeRuntimeProvider(value);
+		case "brevo": return parseBrevoRuntimeProvider(value);
+		case "mailchimp": return parseMailchimpRuntimeProvider(value);
+		default: return null;
+	}
+}
+function parseNativeRuntimeProvider(value) {
+	const defaultTopicId = parseNewsletterListId(value.defaultTopicId);
+	const topics = parseNamedItems(value.topics, parseNewsletterListId);
+	return defaultTopicId !== null && topics !== null ? {
+		provider: "native",
+		defaultTopicId,
+		topics
+	} : null;
+}
+function parseBrevoRuntimeProvider(value) {
+	const defaultListId = parseBrevoListId(value.defaultListId);
+	const lists = parseNamedItems(value.lists, parseBrevoListId);
+	return defaultListId !== null && lists !== null ? {
+		provider: "brevo",
+		defaultListId,
+		lists
+	} : null;
+}
+function parseMailchimpRuntimeProvider(value) {
+	if (!Array.isArray(value.audiences)) return null;
+	const defaultAudienceId = parseMailchimpAudienceId(value.defaultAudienceId);
+	if (defaultAudienceId === null) return null;
+	const audiences = [];
+	for (const audience of value.audiences) {
+		if (!isRecord$6(audience)) return null;
+		const id = parseMailchimpAudienceId(audience.id);
+		const name = parseName(audience.name);
+		if (id === null || name === null || !Array.isArray(audience.interests)) return null;
+		const interests = parseMailchimpInterests(audience.interests);
+		if (interests === null) return null;
+		audiences.push({
+			id,
+			name,
+			interests
+		});
+	}
+	return {
+		provider: "mailchimp",
+		defaultAudienceId,
+		audiences
+	};
+}
+function parseMailchimpInterests(value) {
+	const interests = [];
+	for (const interest of value) {
+		if (!isRecord$6(interest)) return null;
+		const id = parseMailchimpInterestId(interest.id);
+		const name = parseName(interest.name);
+		const categoryName = parseName(interest.categoryName);
+		if (id === null || name === null || categoryName === null) return null;
+		interests.push({
+			id,
+			name,
+			categoryName
+		});
+	}
+	return interests;
+}
+function parseNamedItems(value, parseId) {
+	if (!Array.isArray(value)) return null;
+	const items = [];
+	for (const item of value) {
+		if (!isRecord$6(item)) return null;
+		const id = parseId(item.id);
+		const name = parseName(item.name);
+		if (id === null || name === null) return null;
+		items.push({
+			id,
+			name
+		});
+	}
+	return items;
+}
+function parseName(value) {
+	if (typeof value !== "string") return null;
+	const name = value.trim();
+	return name.length > 0 ? name : null;
+}
+function isRecord$6(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function invalidRuntimeContext() {
+	return err({ tag: "invalid_mailing_list_runtime_context" });
+}
+//#endregion
+//#region ../core/src/mailing-list-targeting-parser.ts
+function parseMailingListPlacementTargeting(value) {
+	if (!isRecord$5(value)) return targetingError("shape");
+	if (value.mode === "default") return ok({ mode: "default" });
+	if (value.mode !== "custom") return targetingError("mode");
+	if (!isRecord$5(value.selection)) return targetingError("selection");
+	switch (value.provider) {
+		case "native": return parseNativeTargeting(value.selection);
+		case "brevo": return parseBrevoTargeting(value.selection);
+		case "mailchimp": return parseMailchimpTargeting(value, value.selection);
+		default: return targetingError("provider");
+	}
+}
+function parseNativeTargeting(selection) {
+	if (selection.tag === "fixed") {
+		const topicIds = parseNonEmptyUniqueIds(selection.topicIds, parseNewsletterListId);
+		return topicIds.ok ? ok({
+			mode: "custom",
+			provider: "native",
+			selection: {
+				tag: "fixed",
+				topicIds: topicIds.value
+			}
+		}) : topicIds;
+	}
+	if (selection.tag === "visitor_choice") {
+		const offeredTopicIds = parseNonEmptyUniqueIds(selection.offeredTopicIds, parseNewsletterListId);
+		return offeredTopicIds.ok ? ok({
+			mode: "custom",
+			provider: "native",
+			selection: {
+				tag: "visitor_choice",
+				offeredTopicIds: offeredTopicIds.value
+			}
+		}) : offeredTopicIds;
+	}
+	return targetingError("selection");
+}
+function parseBrevoTargeting(selection) {
+	if (selection.tag === "fixed") {
+		const listIds = parseNonEmptyUniqueIds(selection.listIds, parseBrevoListId);
+		return listIds.ok ? ok({
+			mode: "custom",
+			provider: "brevo",
+			selection: {
+				tag: "fixed",
+				listIds: listIds.value
+			}
+		}) : listIds;
+	}
+	if (selection.tag === "visitor_choice") {
+		const offeredListIds = parseNonEmptyUniqueIds(selection.offeredListIds, parseBrevoListId);
+		return offeredListIds.ok ? ok({
+			mode: "custom",
+			provider: "brevo",
+			selection: {
+				tag: "visitor_choice",
+				offeredListIds: offeredListIds.value
+			}
+		}) : offeredListIds;
+	}
+	return targetingError("selection");
+}
+function parseMailchimpTargeting(value, selection) {
+	const audienceId = parseMailchimpAudienceId(value.audienceId);
+	if (audienceId === null) return targetingError("audienceId");
+	if (selection.tag === "fixed") {
+		const interestIds = parseUniqueIds(selection.interestIds, parseMailchimpInterestId);
+		return interestIds.ok ? ok({
+			mode: "custom",
+			provider: "mailchimp",
+			audienceId,
+			selection: {
+				tag: "fixed",
+				interestIds: interestIds.value
+			}
+		}) : interestIds;
+	}
+	if (selection.tag === "visitor_choice") {
+		const offeredInterestIds = parseNonEmptyUniqueIds(selection.offeredInterestIds, parseMailchimpInterestId);
+		return offeredInterestIds.ok ? ok({
+			mode: "custom",
+			provider: "mailchimp",
+			audienceId,
+			selection: {
+				tag: "visitor_choice",
+				offeredInterestIds: offeredInterestIds.value
+			}
+		}) : offeredInterestIds;
+	}
+	return targetingError("selection");
+}
+function parseNonEmptyUniqueIds(value, parseId) {
+	const parsed = parseUniqueIds(value, parseId);
+	if (!parsed.ok) return parsed;
+	const [first, ...rest] = parsed.value;
+	return first === void 0 ? targetingError("targets") : ok([first, ...rest]);
+}
+function parseUniqueIds(value, parseId) {
+	if (!Array.isArray(value)) return targetingError("targets");
+	const parsed = [];
+	for (const item of value) {
+		const id = parseId(item);
+		if (id === null) return targetingError("targets");
+		if (parsed.includes(id)) return targetingError("duplicate_target");
+		parsed.push(id);
+	}
+	return ok(parsed);
+}
+function isRecord$5(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function targetingError(field) {
+	return err({
+		tag: "invalid_mailing_list_targeting",
+		field
+	});
+}
+//#endregion
+//#region ../core/src/mailing-list-submission.ts
+function parseMailingListBlockId(value) {
+	const parsed = typeof value === "string" ? value.trim() : "";
+	return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu.test(parsed) ? parsed : null;
+}
+function parseMailingListSignedSourceToken(value) {
+	const parsed = typeof value === "string" ? value.trim() : "";
+	return /^[A-Za-z0-9._~-]{16,1000}$/u.test(parsed) ? parsed : null;
+}
+function buildMailingListSignupBlockSourceRef(blockId) {
+	const parsed = parseMailingListBlockId(blockId);
+	return parsed !== null ? {
+		tag: "block_ref",
+		blockId: parsed
+	} : null;
 }
 function sessionStartMs(session) {
 	return Date.parse(session.startsAt);
@@ -16264,102 +16634,31 @@ const newsletterFormFragment = defineFragment({
 	description: "Newsletter subscription form with preset field configurations.",
 	fields: [
 		{
-			id: "destinationProvider",
-			type: "select",
-			label: "Send signups to",
-			description: "Choose where new subscribers from this form should go.",
-			defaultValue: "riverbank",
-			required: false,
-			ui: { intent: "behavior" },
-			options: [{
-				value: "riverbank",
-				label: "Riverbank newsletter"
-			}]
-		},
-		{
-			id: "listId",
-			type: "reference",
-			label: "Newsletter list",
-			description: "Select the list new subscribers should be added to.",
-			required: false,
-			referenceKind: "newsletterList",
-			allowManualEntry: false,
-			ui: {
-				intent: "behavior",
-				visibleWhen: {
-					field: "destinationProvider",
-					equals: "riverbank"
-				}
-			}
-		},
-		{
-			id: "mailchimpAudienceId",
-			type: "reference",
-			label: "Mailchimp audience",
-			description: "Choose the Mailchimp audience for new subscribers.",
-			required: false,
-			referenceKind: "mailchimpAudience",
-			allowManualEntry: false,
-			ui: {
-				intent: "behavior",
-				visibleWhen: {
-					field: "destinationProvider",
-					equals: "mailchimp"
-				}
-			}
-		},
-		{
-			id: "mailchimpTags",
-			type: "text",
-			label: "Mailchimp tags",
-			description: "Optional tags to apply in Mailchimp, separated by commas or semicolons.",
+			id: "targeting",
+			type: "group",
+			label: "Mailing-list targeting",
+			description: "Choose what kind of emails people signing up here will receive.",
+			defaultValue: { mode: "default" },
+			required: true,
 			ui: {
 				intent: "behavior",
-				visibleWhen: {
-					field: "destinationProvider",
-					equals: "mailchimp"
-				}
-			}
-		},
-		{
-			id: "preset",
-			type: "select",
-			label: "Form fields",
-			description: "Choose which fields to collect.",
-			defaultValue: "emailOnly",
-			ui: { intent: "display" },
-			options: [
-				{
-					value: "emailOnly",
-					label: "Email only"
-				},
-				{
-					value: "emailName",
-					label: "Email + Name"
-				},
-				{
-					value: "emailFirstLast",
-					label: "Email + First/Last Name"
-				},
-				{
-					value: "emailNameCompany",
-					label: "Email + Name + Company (B2B)"
-				}
-			]
-		},
-		{
-			id: "includePhone",
-			type: "boolean",
-			label: "Include phone field (optional)",
-			description: "Adds an optional phone field to the selected preset (never required).",
-			defaultValue: false,
-			ui: { intent: "display" }
-		},
-		{
-			id: "buttonLabel",
-			type: "text",
-			label: "Button label",
-			defaultValue: "Subscribe"
+				widget: "mailingListTargeting"
+			},
+			schema: { fields: [{
+				id: "mode",
+				type: "select",
+				label: "Mode",
+				required: true,
+				defaultValue: "default",
+				options: [{
+					value: "default",
+					label: "Default"
+				}, {
+					value: "custom",
+					label: "Custom"
+				}],
+				ui: { hidden: true }
+			}] }
 		},
 		createButtonVariantField({
 			id: "buttonVariant",
@@ -16367,46 +16666,42 @@ const newsletterFormFragment = defineFragment({
 			defaultValue: "primary"
 		}),
 		{
-			id: "successMessage",
-			type: "text",
-			label: "Success message",
-			description: "Shown after successful subscription.",
-			defaultValue: "Thanks for subscribing!"
-		},
-		{
-			id: "privacyNote",
+			id: "mailingListSource",
 			type: "text",
-			label: "Privacy note",
-			description: "Optional small text below the form (e.g., privacy policy link)."
+			label: "Mailing-list source",
+			ui: {
+				hidden: true,
+				intent: "behavior"
+			}
 		},
 		{
-			id: "tags",
+			id: "mailingListSourceToken",
 			type: "text",
-			label: "Tags (optional)",
-			description: "Optional tags to apply on subscribe (comma or semicolon separated).",
+			label: "Mailing-list source token",
 			ui: {
-				intent: "behavior",
-				visibleWhen: {
-					field: "destinationProvider",
-					equals: "riverbank"
-				}
+				hidden: true,
+				intent: "behavior"
 			}
 		}
 	],
 	layout: [el("newsletter-form", withApiBindings({
-		source: "block",
-		destinationProvider: { $bind: { from: "destinationProvider" } },
-		listId: { $bind: { from: "listId" } },
-		preset: { $bind: { from: "preset" } },
-		includePhone: { $bind: { from: "includePhone" } },
-		buttonLabel: { $bind: { from: "buttonLabel" } },
+		source: { $bind: {
+			from: "mailingListSource",
+			fallback: "block"
+		} },
+		sourceRef: {
+			tag: "signed_source_ref",
+			token: { $bind: { from: "mailingListSourceToken" } }
+		},
+		targeting: { $bind: {
+			from: "targeting",
+			fallback: { mode: "default" }
+		} },
+		mailingList: { $bind: { from: "$root.mailingList" } },
 		buttonVariant: { $bind: {
 			from: "buttonVariant",
 			fallback: "primary"
 		} },
-		successMessage: { $bind: { from: "successMessage" } },
-		privacyNote: { $bind: { from: "privacyNote" } },
-		tags: { $bind: { from: "tags" } },
 		spamProtectionEnabled: { $bind: { from: "$root.spamProtectionEnabled" } }
 	}), [])]
 });
@@ -18581,14 +18876,19 @@ const contactNewsletterLayout = styledSection({
 		as: "h2",
 		className: "newsletter-copy-title"
 	}, when("newsletterTitle"), bind("newsletterTitle")), richText({ className: "newsletter-copy-subtitle rb-prose rb-max-w-none" }, when("newsletterSubtitle"), bind("newsletterSubtitle"))]), el("newsletter-form", withApiBindings({
-		source: "block",
-		listId: { $bind: { from: "listId" } },
-		preset: { $bind: { from: "preset" } },
-		includePhone: { $bind: { from: "includePhone" } },
-		buttonLabel: { $bind: { from: "newsletterButtonLabel" } },
-		successMessage: { $bind: { from: "newsletterSuccessMessage" } },
-		privacyNote: { $bind: { from: "newsletterPrivacyNote" } },
-		tags: { $bind: { from: "newsletterTags" } },
+		source: { $bind: {
+			from: "mailingListSource",
+			fallback: "block"
+		} },
+		sourceRef: {
+			tag: "signed_source_ref",
+			token: { $bind: { from: "mailingListSourceToken" } }
+		},
+		targeting: { $bind: {
+			from: "targeting",
+			fallback: { mode: "default" }
+		} },
+		mailingList: { $bind: { from: "$root.mailingList" } },
 		spamProtectionEnabled: { $bind: { from: "$root.spamProtectionEnabled" } }
 	}), [])])])], { className: "contact-newsletter-container" }),
 	baseClass: "",
@@ -18624,79 +18924,55 @@ const contactNewsletterBlockDefinition = {
 				label: "Newsletter intro"
 			},
 			{
-				id: "listId",
-				type: "reference",
-				label: "Newsletter list",
-				description: "Select the list new subscribers should be added to.",
+				id: "targeting",
+				type: "group",
+				label: "Mailing-list targeting",
+				description: "Choose what kind of emails people signing up here will receive.",
 				required: true,
-				referenceKind: "newsletterList",
-				allowManualEntry: false,
-				ui: { intent: "behavior" }
-			},
-			{
-				id: "preset",
-				type: "select",
-				label: "Newsletter fields",
-				defaultValue: "emailOnly",
-				ui: { intent: "display" },
-				options: [
-					{
-						value: "emailOnly",
-						label: "Email only"
-					},
-					{
-						value: "emailName",
-						label: "Email + Name"
-					},
-					{
-						value: "emailFirstLast",
-						label: "Email + First/Last Name"
-					},
-					{
-						value: "emailNameCompany",
-						label: "Email + Name + Company (B2B)"
-					}
-				]
-			},
-			{
-				id: "includePhone",
-				type: "boolean",
-				label: "Include phone field",
-				defaultValue: false,
-				ui: { intent: "display" }
-			},
-			{
-				id: "newsletterButtonLabel",
-				type: "text",
-				label: "Newsletter button label",
-				defaultValue: "Subscribe",
-				ui: { intent: "display" }
-			},
-			{
-				id: "newsletterSuccessMessage",
-				type: "text",
-				label: "Newsletter success message",
-				defaultValue: "Thanks for subscribing!",
-				ui: { intent: "behavior" }
+				defaultValue: { mode: "default" },
+				ui: {
+					intent: "behavior",
+					widget: "mailingListTargeting"
+				},
+				schema: { fields: [{
+					id: "mode",
+					type: "select",
+					label: "Mode",
+					required: true,
+					defaultValue: "default",
+					options: [{
+						value: "default",
+						label: "Default"
+					}, {
+						value: "custom",
+						label: "Custom"
+					}],
+					ui: { hidden: true }
+				}] }
 			},
 			{
-				id: "newsletterPrivacyNote",
+				id: "contactTitle",
 				type: "text",
-				label: "Privacy note",
-				ui: { intent: "display" }
+				label: "Contact title",
+				defaultValue: "Get in touch"
 			},
 			{
-				id: "newsletterTags",
+				id: "mailingListSource",
 				type: "text",
-				label: "Newsletter tags",
-				description: "Optional tags to apply on subscribe, separated by comma or semicolon.",
-				ui: { intent: "behavior" }
+				label: "Mailing-list source",
+				ui: {
+					hidden: true,
+					intent: "behavior"
+				}
 			},
 			{
-				id: "contactTitle",
+				id: "mailingListSourceToken",
 				type: "text",
-				label: "Contact title",
-				defaultValue: "Get in touch"
+				label: "Mailing-list source token",
+				ui: {
+					hidden: true,
+					intent: "behavior"
+				}
 			},
 			{
 				id: "contactIntro",
@@ -19206,13 +19482,9 @@ const footerStandardContactBindings = {
 };
 const footerMailingListBindings = {
 	source: { $bind: { from: "module.engagement.runtime.source" } },
-	destinationRef: { $bind: { from: "module.engagement.runtime.destinationRef" } },
-	listId: { $bind: { from: "module.engagement.runtime.listId" } },
-	preset: { $bind: { from: "module.engagement.runtime.preset" } },
-	includePhone: { $bind: { from: "module.engagement.runtime.includePhone" } },
-	buttonLabel: { $bind: { from: "module.engagement.runtime.buttonLabel" } },
-	successMessage: { $bind: { from: "module.engagement.runtime.successMessage" } },
-	privacyNote: { $bind: { from: "module.engagement.runtime.privacyNote" } }
+	sourceRef: { $bind: { from: "module.engagement.runtime.sourceRef" } },
+	mailingList: { $bind: { from: "module.engagement.runtime.mailingList" } },
+	targeting: { $bind: { from: "module.engagement.runtime.targeting" } }
 };
 const footerSpamProtectionBinding = { spamProtectionEnabled: { $bind: { from: "$root.spamProtectionEnabled" } } };
 const brandLogo = link({
@@ -20900,40 +21172,112 @@ const appointmentBookingBlockDefinition = {
 		}
 	}
 };
-//#endregion
-//#region ../blocks/src/system/blocks/weekly-slot-availability.ts
-const weeklySlotAvailabilityManifest = createBlockManifest({
-	id: "block.weekly-slot-availability",
-	version: "1.0.0",
-	title: "Weekly Slot Availability",
-	titleSource: "heading",
-	description: "Shows available recurring appointment slot patterns",
-	skipSectionStyles: true,
-	additionalFields: [
-		{
-			id: "serviceId",
-			type: "reference",
-			label: "Appointment service",
-			description: "Choose which appointment service to show availability for",
-			required: true,
-			referenceKind: "appointmentService",
-			allowManualEntry: false,
-			ui: { intent: "behavior" }
-		},
-		{
-			id: "resourceId",
-			type: "reference",
-			label: "Appointment resource",
-			description: "Optionally narrow the availability to one practitioner or room",
-			required: false,
-			referenceKind: "appointmentResource",
-			allowManualEntry: false,
-			ui: { intent: "behavior" }
-		},
-		{
-			id: "horizonWeeks",
-			type: "select",
-			label: "Look ahead",
+const appointmentServicesBlockDefinition = {
+	manifest: createBlockManifest({
+		id: "block.appointment-services",
+		version: "1.0.0",
+		title: "Appointment Services",
+		titleSource: "heading",
+		description: "List public appointment services with booking links",
+		skipSectionStyles: true,
+		additionalFields: [
+			{
+				id: "heading",
+				type: "text",
+				label: "Heading",
+				required: false,
+				multiline: false,
+				defaultValue: "Appointments",
+				ui: { intent: "content" }
+			},
+			{
+				id: "description",
+				type: "richText",
+				label: "Description",
+				required: false,
+				ui: { intent: "content" }
+			},
+			sectionStylesField({
+				id: "_sectionStyles",
+				label: "Section styles",
+				renderInHeader: false
+			})
+		],
+		styleTokens: {
+			background: "surface",
+			typography: "body",
+			spacing: "md"
+		},
+		behaviours: {
+			supportsThemeSwitching: true,
+			inlineEditing: true,
+			animation: false,
+			paletteHidden: false
+		},
+		category: "interactive",
+		contentSource: { kind: "inline" },
+		tags: [
+			"booking",
+			"appointment",
+			"services",
+			"scheduling"
+		],
+		icon: "CalendarDays",
+		layout: [styledSection({
+			baseClass: "",
+			spacing: "spacious",
+			children: sectionContainer([
+				text({ as: "h2" }, bind("content.heading"), when("content.heading")),
+				richText({ className: "rb-prose rb-max-w-none" }, bind("content.description"), when("content.description")),
+				el("appointment-services", {
+					sectionHeading: { $bind: { from: "content.heading" } },
+					services: { $bind: { from: "data.services" } },
+					pathname: { $bind: { from: "$root.pathname" } }
+				})
+			], { gap: "lg" })
+		})]
+	}),
+	dataSchemas: { services: z.unknown().optional() },
+	dataLoaders: { services: {
+		endpoint: "getPublicBookingServices",
+		params: { siteId: { $bind: { from: "$root.siteId" } } },
+		mode: "server"
+	} }
+};
+//#endregion
+//#region ../blocks/src/system/blocks/weekly-slot-availability.ts
+const weeklySlotAvailabilityManifest = createBlockManifest({
+	id: "block.weekly-slot-availability",
+	version: "1.0.0",
+	title: "Weekly Slot Availability",
+	titleSource: "heading",
+	description: "Shows available recurring appointment slot patterns",
+	skipSectionStyles: true,
+	additionalFields: [
+		{
+			id: "serviceId",
+			type: "reference",
+			label: "Appointment service",
+			description: "Choose which appointment service to show availability for",
+			required: true,
+			referenceKind: "appointmentService",
+			allowManualEntry: false,
+			ui: { intent: "behavior" }
+		},
+		{
+			id: "resourceId",
+			type: "reference",
+			label: "Appointment resource",
+			description: "Optionally narrow the availability to one practitioner or room",
+			required: false,
+			referenceKind: "appointmentResource",
+			allowManualEntry: false,
+			ui: { intent: "behavior" }
+		},
+		{
+			id: "horizonWeeks",
+			type: "select",
+			label: "Look ahead",
 			required: false,
 			multiple: false,
 			defaultValue: "4",
@@ -22208,8 +22552,8 @@ z.object({
 	previewToken: z.string().nullable().optional(),
 	stage: previewStageSchema.optional()
 });
-function buildEventRegistrationDisplay(source) {
-	const selectedRun = resolveSelectedWholeSeriesRun(source);
+function buildEventRegistrationDisplayFromScopedEvents(source, scopedSourceEvents) {
+	const selectedRun = resolveSelectedWholeSeriesRun(scopedSourceEvents);
 	if (selectedRun && (!selectedRun.run.enrollmentOpen || toWholeSeriesRegistrationEvent(selectedRun) === null)) return {
 		kind: "event-registration",
 		state: "registration-closed",
@@ -22217,7 +22561,7 @@ function buildEventRegistrationDisplay(source) {
 		titleText: "Registration closed",
 		bodyText: "This run is no longer open for bookings."
 	};
-	const stepLabels = buildEventRegistrationShellStepLabels(source);
+	const stepLabels = buildEventRegistrationShellStepLabels(source, scopedSourceEvents);
 	return {
 		kind: "event-registration",
 		state: "generic-shell",
@@ -22228,8 +22572,8 @@ function buildEventRegistrationDisplay(source) {
 		summaryButtonText: source.buttonText?.trim() || "Register"
 	};
 }
-function buildEventRegistrationShellStepLabels(source) {
-	const selectedRun = resolveSelectedWholeSeriesRun(source);
+function buildEventRegistrationShellStepLabels(source, scopedSourceEvents) {
+	const selectedRun = resolveSelectedWholeSeriesRun(scopedSourceEvents);
 	if (selectedRun) {
 		const selectedEvent = toWholeSeriesRegistrationEvent(selectedRun);
 		if (!selectedEvent) return EVENT_REGISTRATION_GENERIC_SHELL_STEP_LABELS;
@@ -22239,7 +22583,7 @@ function buildEventRegistrationShellStepLabels(source) {
 			event: selectedEvent
 		})).map((step) => shellLabelForRegistrationStep(step, [selectedEvent]));
 	}
-	const scopedEvents = scopeEventRegistrationEvents(source);
+	const scopedEvents = toScopedEventRegistrationEvents(scopedSourceEvents);
 	if (scopedEvents.length === 0) return EVENT_REGISTRATION_GENERIC_SHELL_STEP_LABELS;
 	const preSelectedEvent = findPreSelectedEvent({
 		scopedEvents,
@@ -22252,31 +22596,25 @@ function buildEventRegistrationShellStepLabels(source) {
 		event: preSelectedEvent
 	}) : false).map((step) => shellLabelForRegistrationStep(step, scopedEvents));
 }
-function scopeEventRegistrationEvents(source) {
-	const scoped = scopeEventRegistrationSourceEvents(source);
-	return [...toRegistrationEvents(scoped), ...toWholeSeriesRegistrationEvents(scoped)];
+function toScopedEventRegistrationEvents(scopedSourceEvents) {
+	return [...toRegistrationEvents(scopedSourceEvents), ...toWholeSeriesRegistrationEvents(scopedSourceEvents)];
 }
-/**
-* Every event this surface may register for, from both of its loads.
-*
-* The date page and the run read answer different questions and can name the
-* same occurrence, so the two lists are joined and any occurrence that arrives
-* twice is kept once, in the order the date page gave it.
-*/
 function scopeEventRegistrationSourceEvents(source) {
-	const byOccurrenceId = /* @__PURE__ */ new Map();
-	for (const event of [...source.events ?? [], ...source.wholeSeriesRunEvents ?? []]) if (!byOccurrenceId.has(event.occurrenceId)) byOccurrenceId.set(event.occurrenceId, event);
-	return resolveEventRegistrationScopedEvents([...byOccurrenceId.values()], {
+	return resolveEventRegistrationScopedEvents(source.wholeSeriesRunEvents ?? source.events ?? [], {
 		occurrenceContext: source.occurrenceContext,
 		subject: source.subject
 	});
 }
+function resolveLoadedEventRegistrationSourceEvents(source, scopedSourceEvents) {
+	if (source.events == null && source.wholeSeriesRunEvents == null) return null;
+	return [...scopedSourceEvents];
+}
 /**
 * The one run this surface is registering for, when the scoped events describe
 * exactly one. More than one run means the visitor still has to choose.
 */
-function resolveSelectedWholeSeriesRun(source) {
-	const runs = groupPublicEventsByRun(scopeEventRegistrationSourceEvents(source));
+function resolveSelectedWholeSeriesRun(scopedSourceEvents) {
+	const runs = groupPublicEventsByRun(scopedSourceEvents);
 	return runs.length === 1 ? runs[0] : null;
 }
 function shellLabelForRegistrationStep(step, events) {
@@ -22310,9 +22648,10 @@ const eventRegistrationBlockRuntime = defineClientOwnedBlockRuntime({
 		render: createZodCodec(eventRegistrationRenderSchema)
 	},
 	buildRender: (source) => {
-		const events = source.events == null ? null : scopeEventRegistrationSourceEvents(source);
+		const scopedSourceEvents = scopeEventRegistrationSourceEvents(source);
+		const events = resolveLoadedEventRegistrationSourceEvents(source, scopedSourceEvents);
 		return {
-			display: buildEventRegistrationDisplay(source),
+			display: buildEventRegistrationDisplayFromScopedEvents(source, scopedSourceEvents),
 			hydration: {
 				occurrenceContext: source.occurrenceContext ?? null,
 				subject: source.subject ?? null,
@@ -22513,6 +22852,11 @@ const eventRegistrationBlockDefinition = {
 	dataLoaders: {
 		events: {
 			endpoint: "listPublicEvents",
+			when: { $bind: {
+				from: "$root.subject.isWholeSeriesBooking",
+				fallback: true,
+				transforms: [{ id: "boolean.not" }]
+			} },
 			params: {
 				siteId: { $bind: { from: "$root.siteId" } },
 				limit: "50",
@@ -22534,13 +22878,9 @@ const eventRegistrationBlockDefinition = {
 		/**
 		* The runs this page can register for, finished ones included.
 		*
-		* The `events` page above is date-bounded, so a run whose first session has
-		* passed contributes no rows to it and the surface would have nothing to
-		* render as closed. This asks for runs instead, and only on a page whose
-		* subject books whole runs. It is scoped exactly like the date page — same
-		* series, same run subroute — because scope and grain are separate
-		* questions. The two lists are joined by occurrence, so a run that appears
-		* in both is still one run.
+		* A run read is the sole Event source on a whole-series surface. It is
+		* status-bounded rather than date-bounded, so completed runs can still
+		* render their closed state and every run carries its complete schedule.
 		*/
 		wholeSeriesRunEvents: {
 			endpoint: "listPublicEvents",
@@ -25045,68 +25385,6 @@ const recurringScheduleBlockDefinition = {
 	} }
 };
 //#endregion
-//#region ../blocks/src/system/types/link.ts
-const nullableString = z.union([z.string().min(1), z.null()]);
-const RESOLVED_INTERNAL_LINK_ENTITY_TYPES = [
-	"page",
-	"content",
-	"pageSurface"
-];
-const resolvedInternalLinkKeys = [
-	"entityId",
-	"entityType",
-	"href",
-	"title",
-	"typeLabel"
-];
-const internalRouteOnlyLinkSchema = z.object({
-	kind: z.literal("internal"),
-	routeId: z.string().min(1)
-}).passthrough().superRefine((value, ctx) => {
-	if (!resolvedInternalLinkKeys.some((key) => value[key] != null)) return;
-	ctx.addIssue({
-		code: "custom",
-		message: "Internal links with resolved metadata must include entityId, entityType, href, title, and typeLabel"
-	});
-});
-const internalResolvedLinkSchema = z.object({
-	kind: z.literal("internal"),
-	routeId: z.string().min(1),
-	entityId: z.string().min(1),
-	entityType: z.enum(RESOLVED_INTERNAL_LINK_ENTITY_TYPES),
-	href: z.string().min(1),
-	title: z.string().min(1),
-	typeLabel: z.string().min(1),
-	contentTypeKey: nullableString.optional(),
-	contentTypeName: nullableString.optional(),
-	updatedAt: nullableString.optional()
-}).passthrough();
-const internalLinkSchema = z.union([internalResolvedLinkSchema, internalRouteOnlyLinkSchema]);
-const externalLinkSchema = z.object({
-	kind: z.literal("external"),
-	href: z.string().min(1)
-}).passthrough();
-const customLinkSchema = z.object({
-	kind: z.literal("url"),
-	href: z.string().min(1)
-}).passthrough();
-const pageLinkSchema = z.object({
-	kind: z.literal("page"),
-	identifier: z.string().min(1)
-}).passthrough();
-const entryLinkSchema = z.object({
-	kind: z.literal("entry"),
-	contentType: z.string().min(1),
-	identifier: z.string().min(1)
-}).passthrough();
-z.union([
-	internalLinkSchema,
-	externalLinkSchema,
-	customLinkSchema,
-	pageLinkSchema,
-	entryLinkSchema
-]);
-//#endregion
 //#region ../blocks/src/system/blocks/offerings-preview/model.ts
 const OFFERINGS_PREVIEW_DEFAULT_BUTTON_TEXT = "Book";
 const OFFERINGS_PREVIEW_DEFAULT_EMPTY_MESSAGE = "Nothing scheduled just yet.";
@@ -25191,20 +25469,7 @@ function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
-//#region ../blocks/src/system/blocks/offerings-preview/index.ts
-/**
-* The whole-series presets, as the CSV `listPublicEvents` expects. Both
-* whole-series presets share one loader: the block renders them as a single
-* run group.
-*/
-const WHOLE_SERIES_EVENT_PRESETS_PARAM = WHOLE_SERIES_EVENT_PRESET_VALUES.join(",");
-const publicRouteCandidatesSchema = z.object({ routes: z.array(z.object({
-	entityId: z.string(),
-	path: z.string(),
-	title: z.string(),
-	kind: z.enum(RESOLVED_INTERNAL_LINK_ENTITY_TYPES),
-	contentTypeKey: z.string().nullable().optional()
-})) });
+//#region ../blocks/src/system/blocks/offerings-preview/fields.ts
 const groupOverrideFields = [
 	{
 		id: "sourceKey",
@@ -25410,7 +25675,127 @@ const offeringsPreviewFields = [
 		renderInHeader: false
 	})
 ];
+function labelForOfferingPreviewSourceKey(sourceKey) {
+	const eventDefinition = OFFERINGS_PREVIEW_EVENT_PRESET_DEFINITIONS.find((definition) => definition.sourceKey === sourceKey);
+	if (eventDefinition) return eventDefinition.label;
+	return "Courses";
+}
+//#endregion
+//#region ../blocks/src/system/types/link.ts
+const nullableString = z.union([z.string().min(1), z.null()]);
+const RESOLVED_INTERNAL_LINK_ENTITY_TYPES = [
+	"page",
+	"content",
+	"pageSurface"
+];
+const resolvedInternalLinkKeys = [
+	"entityId",
+	"entityType",
+	"href",
+	"title",
+	"typeLabel"
+];
+const internalRouteOnlyLinkSchema = z.object({
+	kind: z.literal("internal"),
+	routeId: z.string().min(1)
+}).passthrough().superRefine((value, ctx) => {
+	if (!resolvedInternalLinkKeys.some((key) => value[key] != null)) return;
+	ctx.addIssue({
+		code: "custom",
+		message: "Internal links with resolved metadata must include entityId, entityType, href, title, and typeLabel"
+	});
+});
+const internalResolvedLinkSchema = z.object({
+	kind: z.literal("internal"),
+	routeId: z.string().min(1),
+	entityId: z.string().min(1),
+	entityType: z.enum(RESOLVED_INTERNAL_LINK_ENTITY_TYPES),
+	href: z.string().min(1),
+	title: z.string().min(1),
+	typeLabel: z.string().min(1),
+	contentTypeKey: nullableString.optional(),
+	contentTypeName: nullableString.optional(),
+	updatedAt: nullableString.optional()
+}).passthrough();
+const internalLinkSchema = z.union([internalResolvedLinkSchema, internalRouteOnlyLinkSchema]);
+const externalLinkSchema = z.object({
+	kind: z.literal("external"),
+	href: z.string().min(1)
+}).passthrough();
+const customLinkSchema = z.object({
+	kind: z.literal("url"),
+	href: z.string().min(1)
+}).passthrough();
+const pageLinkSchema = z.object({
+	kind: z.literal("page"),
+	identifier: z.string().min(1)
+}).passthrough();
+const entryLinkSchema = z.object({
+	kind: z.literal("entry"),
+	contentType: z.string().min(1),
+	identifier: z.string().min(1)
+}).passthrough();
+z.union([
+	internalLinkSchema,
+	externalLinkSchema,
+	customLinkSchema,
+	pageLinkSchema,
+	entryLinkSchema
+]);
+//#endregion
+//#region ../blocks/src/system/blocks/offerings-preview/index.ts
+/**
+* The whole-series presets, as the CSV `listPublicEvents` expects. Both
+* whole-series presets share one loader: the block renders them as a single
+* run group.
+*/
+const WHOLE_SERIES_EVENT_PRESETS_PARAM = WHOLE_SERIES_EVENT_PRESET_VALUES.join(",");
+const publicRouteCandidatesSchema = z.object({ routes: z.array(z.object({
+	entityId: z.string(),
+	path: z.string(),
+	title: z.string(),
+	kind: z.enum(RESOLVED_INTERNAL_LINK_ENTITY_TYPES),
+	contentTypeKey: z.string().nullable().optional()
+})) });
 const offeringsPreviewEventDataBindings = Object.fromEntries(OFFERINGS_PREVIEW_EVENT_PRESET_DEFINITIONS.map((definition) => [definition.dataKey, { $bind: { from: `data.${definition.dataKey}` } }]));
+const DEFAULT_OFFERINGS_PREVIEW_DISPLAY_MODE = "preview";
+const displayModeBinding = {
+	from: "content.displayMode",
+	fallback: DEFAULT_OFFERINGS_PREVIEW_DISPLAY_MODE
+};
+const catalogueMode = { $bind: {
+	...displayModeBinding,
+	transforms: [{
+		id: "value.equals",
+		options: { value: "catalogue" }
+	}]
+} };
+const previewMode = { $bind: {
+	...displayModeBinding,
+	transforms: [{
+		id: "value.equals",
+		options: { value: "preview" }
+	}]
+} };
+function offeringsPreviewHeaderNodes() {
+	return [text({
+		as: "h2",
+		className: { $bind: {
+			from: "content.displayMode",
+			fallback: "rb-text-center",
+			transforms: [{
+				id: "value.equals",
+				options: { value: "catalogue" }
+			}, {
+				id: "ui.conditionalClass",
+				options: {
+					whenTrue: "rb-text-left",
+					whenFalse: "rb-text-center"
+				}
+			}]
+		} }
+	}, bind("content.heading"), when("content.heading")), richText({ className: "rb-prose rb-max-w-none" }, bind("content.description"), when("content.description"))];
+}
 const offeringsPreviewManifest = createBlockManifest({
 	id: "block.offerings-preview",
 	version: "1.0.0",
@@ -25441,48 +25826,45 @@ const offeringsPreviewManifest = createBlockManifest({
 	],
 	icon: "PanelsTopLeft",
 	layout: [styledSection({
-		children: sectionContainer([
-			text({
-				as: "h2",
-				className: "rb-text-center"
-			}, bind("content.heading"), when("content.heading")),
-			richText({ className: "rb-prose rb-max-w-none" }, bind("content.description"), when("content.description")),
-			el("offerings-preview", {
-				bookingOfferingPresets: { $bind: {
-					from: "$root.bookingOfferingPresets",
-					fallback: []
-				} },
-				groupOverrides: { $bind: {
-					from: "content.groupOverrides",
-					fallback: []
-				} },
-				groupOrder: { $bind: { from: "content.groupOrder" } },
-				cardStyles: { $bind: { from: "content._cardStyles" } },
-				itemLimit: { $bind: {
-					from: "content.itemLimit",
-					fallback: "3"
-				} },
-				buttonVariant: { $bind: {
-					from: "content.buttonVariant",
-					fallback: "primary"
-				} },
-				buttonText: { $bind: {
-					from: "content.buttonText",
-					fallback: OFFERINGS_PREVIEW_DEFAULT_BUTTON_TEXT
-				} },
-				emptyMessage: { $bind: {
-					from: "content.emptyMessage",
-					fallback: OFFERINGS_PREVIEW_DEFAULT_EMPTY_MESSAGE
-				} },
-				previewStage: { $bind: {
-					from: "$root.previewStage",
-					fallback: "published"
-				} },
-				routeCandidates: { $bind: { from: "data.routeCandidates" } },
-				wholeSeriesRunEvents: { $bind: { from: "data.wholeSeriesRunEvents" } },
-				...offeringsPreviewEventDataBindings
-			})
-		], { gap: "lg" }),
+		children: sectionContainer([el("offerings-preview", {
+			displayMode: { $bind: displayModeBinding },
+			pathname: { $bind: { from: "$root.pathname" } },
+			catalogueEvents: { $bind: { from: "data.catalogueEvents" } },
+			quickDateEvents: { $bind: { from: "data.quickDateEvents" } },
+			bookingOfferingPresets: { $bind: {
+				from: "$root.bookingOfferingPresets",
+				fallback: []
+			} },
+			groupOverrides: { $bind: {
+				from: "content.groupOverrides",
+				fallback: []
+			} },
+			groupOrder: { $bind: { from: "content.groupOrder" } },
+			cardStyles: { $bind: { from: "content._cardStyles" } },
+			itemLimit: { $bind: {
+				from: "content.itemLimit",
+				fallback: "3"
+			} },
+			buttonVariant: { $bind: {
+				from: "content.buttonVariant",
+				fallback: "primary"
+			} },
+			buttonText: { $bind: {
+				from: "content.buttonText",
+				fallback: OFFERINGS_PREVIEW_DEFAULT_BUTTON_TEXT
+			} },
+			emptyMessage: { $bind: {
+				from: "content.emptyMessage",
+				fallback: OFFERINGS_PREVIEW_DEFAULT_EMPTY_MESSAGE
+			} },
+			previewStage: { $bind: {
+				from: "$root.previewStage",
+				fallback: "published"
+			} },
+			routeCandidates: { $bind: { from: "data.routeCandidates" } },
+			wholeSeriesRunEvents: { $bind: { from: "data.wholeSeriesRunEvents" } },
+			...offeringsPreviewEventDataBindings
+		}, offeringsPreviewHeaderNodes())], { gap: "lg" }),
 		baseClass: "",
 		spacing: "comfortable"
 	})]
@@ -25496,16 +25878,48 @@ const offeringsPreviewBlockDefinition = {
 	dataSchemas: {
 		...offeringsPreviewEventDataSchemas,
 		routeCandidates: publicRouteCandidatesSchema.optional(),
-		wholeSeriesRunEvents: optionalPublicEventsArraySchema
+		wholeSeriesRunEvents: optionalPublicEventsArraySchema,
+		catalogueEvents: optionalPublicEventsArraySchema,
+		quickDateEvents: optionalPublicEventsArraySchema
 	},
 	dataLoaders: {
 		...offeringsPreviewEventDataLoaders,
 		routeCandidates: {
 			endpoint: "listPublicRouteCandidates",
+			when: previewMode,
 			params: {},
 			mode: "server"
 		},
-		wholeSeriesRunEvents: wholeSeriesRunLoader()
+		wholeSeriesRunEvents: wholeSeriesRunLoader(),
+		catalogueEvents: {
+			endpoint: "listPublicEvents",
+			when: catalogueMode,
+			params: {
+				stage: { $bind: {
+					from: "$root.previewStage",
+					fallback: "published"
+				} },
+				detailLevel: "listing",
+				readProfile: "listing-card",
+				readIntent: "catalogue"
+			},
+			mode: "server"
+		},
+		quickDateEvents: {
+			endpoint: "listPublicEvents",
+			when: catalogueMode,
+			params: {
+				stage: { $bind: {
+					from: "$root.previewStage",
+					fallback: "published"
+				} },
+				detailLevel: "listing",
+				readProfile: "listing-card",
+				readIntent: "occurrences",
+				limit: 40
+			},
+			mode: "server"
+		}
 	}
 };
 /**
@@ -25522,6 +25936,7 @@ function wholeSeriesRunLoader() {
 function eventPresetLoader(eventPresets, extraParams = {}) {
 	return {
 		endpoint: "listPublicEvents",
+		when: previewMode,
 		params: {
 			siteId: { $bind: { from: "$root.siteId" } },
 			limit: { $bind: {
@@ -25540,15 +25955,10 @@ function eventPresetLoader(eventPresets, extraParams = {}) {
 		mode: "server"
 	};
 }
-function labelForOfferingPreviewSourceKey(sourceKey) {
-	const eventDefinition = OFFERINGS_PREVIEW_EVENT_PRESET_DEFINITIONS.find((definition) => definition.sourceKey === sourceKey);
-	if (eventDefinition) return eventDefinition.label;
-	return "Courses";
-}
 function normalizeOfferingsPreviewBlockContent(value) {
 	const record = normalizeOfferingsPreviewContentForWrite(value);
-	if (!record) return {};
-	const normalized = {};
+	if (!record) return { displayMode: DEFAULT_OFFERINGS_PREVIEW_DISPLAY_MODE };
+	const normalized = { displayMode: normalizeOfferingsPreviewDisplayMode(record.displayMode) };
 	if (typeof record.heading === "string" || record.heading === null) normalized.heading = record.heading;
 	if ("description" in record) normalized.description = record.description;
 	if (isOfferingsPreviewItemLimit(record.itemLimit)) normalized.itemLimit = record.itemLimit;
@@ -25565,6 +25975,9 @@ function normalizeOfferingsPreviewBlockContent(value) {
 	if (sectionStyles !== void 0) normalized._sectionStyles = sectionStyles;
 	return normalized;
 }
+function normalizeOfferingsPreviewDisplayMode(value) {
+	return value === "catalogue" ? "catalogue" : DEFAULT_OFFERINGS_PREVIEW_DISPLAY_MODE;
+}
 function isOfferingsPreviewItemLimit(value) {
 	return value === "1" || value === "2" || value === "3" || value === "4" || value === "5" || value === "6" || value === null;
 }
@@ -28779,63 +29192,13 @@ const giftingBlockDefinition = {
 	} }
 };
 //#endregion
-//#region ../blocks/src/system/blocks/newsletter-signup-destination.ts
-function parseNewsletterSignupBlockId(value) {
-	const trimmed = parseTrimmedString(value);
-	return trimmed && BLOCK_ID_PATTERN.test(trimmed) ? trimmed : null;
-}
-function parseSignedNewsletterDestinationRef(value) {
-	const trimmed = parseTrimmedString(value);
-	return trimmed && SIGNED_DESTINATION_REF_PATTERN.test(trimmed) ? trimmed : null;
-}
-function buildNewsletterSignupBlockRef(blockId) {
-	const parsed = parseNewsletterSignupBlockId(blockId);
-	return parsed ? {
-		tag: "block_ref",
-		blockId: parsed
-	} : null;
-}
-function normalizeNewsletterSignupEditorValuesForDestination(values) {
-	const destinationProvider = parseNewsletterSignupDestinationProvider(values.destinationProvider) ?? "riverbank";
-	if (destinationProvider === "mailchimp") return {
-		destinationProvider,
-		mailchimpAudienceId: values.mailchimpAudienceId,
-		mailchimpTags: values.mailchimpTags
-	};
-	return {
-		destinationProvider,
-		listId: values.listId,
-		tags: values.tags
-	};
-}
-function deriveNewsletterSignupRuntimeSource(values) {
-	const normalized = normalizeNewsletterSignupEditorValuesForDestination(values);
-	if (normalized.destinationProvider === "mailchimp") return {
-		destinationProvider: "mailchimp",
-		listId: null,
-		tags: null
-	};
-	return {
-		destinationProvider: "riverbank",
-		listId: parseTrimmedString(normalized.listId),
-		tags: parseTrimmedString(normalized.tags)
-	};
-}
-const BLOCK_ID_PATTERN = /^[A-Za-z0-9._:-]{1,200}$/;
-const SIGNED_DESTINATION_REF_PATTERN = /^[A-Za-z0-9._~-]{16,1000}$/;
-function parseTrimmedString(value) {
-	if (typeof value !== "string") return null;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : null;
-}
-//#endregion
 //#region ../blocks/src/system/runtime/nodes/newsletter-form.types.ts
 /**
 * Get form fields based on preset configuration.
 */
-function getPresetFields(preset, options) {
-	const includePhone = Boolean(options?.includePhone);
-	switch (preset) {
+function getGlobalFormFields(form) {
+	const includePhone = form.includeOptionalPhone;
+	switch (form.fields.preset) {
 		case "emailOnly": return withOptionalPhone([{
 			id: "email",
 			type: "email",
@@ -28853,7 +29216,7 @@ function getPresetFields(preset, options) {
 			id: "name",
 			type: "text",
 			label: "Name",
-			required: false,
+			required: form.fields.name === "required",
 			placeholder: "Your name"
 		}], includePhone);
 		case "emailFirstLast": return withOptionalPhone([
@@ -28868,14 +29231,14 @@ function getPresetFields(preset, options) {
 				id: "firstName",
 				type: "text",
 				label: "First Name",
-				required: false,
+				required: form.fields.firstName === "required",
 				placeholder: "First name"
 			},
 			{
 				id: "lastName",
 				type: "text",
 				label: "Last Name",
-				required: false,
+				required: form.fields.lastName === "required",
 				placeholder: "Last name"
 			}
 		], includePhone);
@@ -28891,14 +29254,14 @@ function getPresetFields(preset, options) {
 				id: "name",
 				type: "text",
 				label: "Name",
-				required: false,
+				required: form.fields.name === "required",
 				placeholder: "Your name"
 			},
 			{
 				id: "company",
 				type: "text",
 				label: "Company",
-				required: false,
+				required: form.fields.company === "required",
 				placeholder: "Company name"
 			}
 		], includePhone);
@@ -28917,14 +29280,29 @@ function withOptionalPhone(fields, includePhone) {
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/newsletter-form.interactive.ts
-const newsletterPresetSchema = z.enum([
-	"emailOnly",
-	"emailName",
-	"emailFirstLast",
-	"emailNameCompany"
-]);
-const newsletterDestinationProviderSchema = z.enum(["riverbank", "mailchimp"]);
 const newsletterButtonVariantSchema = blockButtonRoleSchema;
+const mailingListContextSchema = z.unknown().transform((value, ctx) => {
+	const parsed = parseMailingListRuntimeContext(value);
+	if (!parsed.ok) {
+		ctx.addIssue({
+			code: z.ZodIssueCode.custom,
+			message: "Invalid mailing-list runtime context"
+		});
+		return z.NEVER;
+	}
+	return parsed.value;
+});
+const mailingListTargetingSchema = z.unknown().transform((value, ctx) => {
+	const parsed = parseMailingListPlacementTargeting(value);
+	if (!parsed.ok) {
+		ctx.addIssue({
+			code: z.ZodIssueCode.custom,
+			message: "Invalid mailing-list targeting"
+		});
+		return z.NEVER;
+	}
+	return parsed.value;
+});
 const newsletterFieldSchema = z.object({
 	id: z.string(),
 	type: z.enum(["email", "text"]),
@@ -28932,73 +29310,73 @@ const newsletterFieldSchema = z.object({
 	required: z.boolean(),
 	placeholder: z.string().optional()
 });
-const newsletterSignupBlockIdSchema = z.string().trim().min(1).transform(parseRequiredNewsletterSignupBlockId);
-const signedNewsletterDestinationRefSchema = z.string().trim().min(1).transform(parseRequiredSignedNewsletterDestinationRef);
+const mailingListSignupBlockIdSchema = z.string().trim().min(1).transform(parseRequiredMailingListSignupBlockId);
+const signedMailingListSourceTokenSchema = z.string().trim().min(1).transform(parseRequiredMailingListSignedSourceToken);
 const newsletterSourceCommonSchema = z.object({
 	siteId: z.string().optional(),
 	apiBaseUrl: z.string().optional(),
-	preset: newsletterPresetSchema.optional(),
-	includePhone: z.boolean().optional(),
-	buttonLabel: z.string().nullable().optional(),
+	mailingList: mailingListContextSchema.optional(),
+	targeting: mailingListTargetingSchema.optional(),
 	buttonVariant: newsletterButtonVariantSchema.nullable().optional(),
-	successMessage: z.string().nullable().optional(),
-	privacyNote: z.string().nullable().optional(),
-	tags: z.string().nullable().optional(),
 	spamProtectionEnabled: z.boolean().optional(),
 	className: z.string().nullable().optional()
 });
 const newsletterSourceSchema = z.discriminatedUnion("source", [
 	newsletterSourceCommonSchema.extend({
 		source: z.literal("block"),
-		blockId: z.string().nullable().optional(),
-		listId: z.string().nullable().optional(),
-		destinationProvider: newsletterDestinationProviderSchema.nullable().optional()
+		blockId: z.string().nullable().optional()
 	}),
 	newsletterSourceCommonSchema.extend({
 		source: z.literal("signed-footer"),
-		destinationRef: z.object({
-			tag: z.literal("signed_destination_ref"),
-			token: signedNewsletterDestinationRefSchema
+		sourceRef: z.object({
+			tag: z.literal("signed_source_ref"),
+			token: signedMailingListSourceTokenSchema
 		})
 	}),
-	newsletterSourceCommonSchema.extend({
-		source: z.literal("legacy-direct-list"),
-		listId: z.string().nullable()
-	})
+	newsletterSourceCommonSchema.extend({ source: z.literal("preview") })
 ]);
 const newsletterDisplaySchema = z.object({
 	kind: z.literal("newsletter-form"),
+	availability: z.enum(["ready", "unavailable"]),
 	className: z.string().nullable(),
 	buttonLabel: z.string(),
 	buttonVariant: newsletterButtonVariantSchema,
-	successMessage: z.string().nullable(),
 	privacyNote: z.string().nullable(),
-	fields: z.array(newsletterFieldSchema)
+	fields: z.array(newsletterFieldSchema),
+	choices: z.array(z.object({
+		id: z.string(),
+		label: z.string()
+	}))
 });
 const newsletterHydrationSchema = z.object({
 	target: z.discriminatedUnion("tag", [
 		z.object({
 			tag: z.literal("block-source"),
-			destinationRef: z.object({
+			sourceRef: z.object({
 				tag: z.literal("block_ref"),
-				blockId: newsletterSignupBlockIdSchema
+				blockId: mailingListSignupBlockIdSchema
 			}).nullable()
 		}),
 		z.object({
 			tag: z.literal("signed-footer-source"),
-			destinationRef: z.object({
-				tag: z.literal("signed_destination_ref"),
-				token: signedNewsletterDestinationRefSchema
+			sourceRef: z.object({
+				tag: z.literal("signed_source_ref"),
+				token: signedMailingListSourceTokenSchema
 			})
 		}),
-		z.object({
-			tag: z.literal("legacy-direct-list"),
-			listId: z.string().nullable()
-		})
+		z.object({ tag: z.literal("preview") })
+	]),
+	setupRevision: z.number().int().positive().nullable(),
+	choiceProvider: z.enum([
+		"native",
+		"brevo",
+		"mailchimp"
+	]).nullable(),
+	choicePresentation: z.enum([
+		"hidden",
+		"automatic",
+		"visitor_choice"
 	]),
-	preset: newsletterPresetSchema,
-	includePhone: z.boolean(),
-	tags: z.string().nullable().optional(),
 	spamProtectionEnabled: z.boolean().optional()
 });
 const newsletterRenderSchema = z.object({
@@ -29010,16 +29388,24 @@ z.object({
 	apiBaseUrl: z.string().optional()
 });
 function buildNewsletterDisplay(source) {
-	const preset = source.preset ?? "emailOnly";
-	const includePhone = source.includePhone ?? false;
+	const context = source.mailingList;
+	const form = context?.tag === "configured" ? context.form : {
+		fields: { preset: "emailOnly" },
+		includeOptionalPhone: false,
+		buttonLabel: "Subscribe",
+		privacyNote: null
+	};
+	const targeting = source.targeting ?? { mode: "default" };
+	const choices = resolveRuntimeChoices(context, targeting);
 	return {
 		kind: "newsletter-form",
+		availability: runtimeTargetingIsAvailable(context, targeting, choices) ? "ready" : "unavailable",
 		className: source.className ?? null,
-		buttonLabel: source.buttonLabel?.trim() || "Subscribe",
+		buttonLabel: form.buttonLabel,
 		buttonVariant: source.buttonVariant ?? "primary",
-		successMessage: source.successMessage ?? "Thanks for subscribing!",
-		privacyNote: source.privacyNote ?? null,
-		fields: getPresetFields(preset, { includePhone })
+		privacyNote: form.privacyNote,
+		fields: getGlobalFormFields(form),
+		choices
 	};
 }
 const newsletterFormBlockRuntime = defineProgressiveBlockRuntime({
@@ -29029,14 +29415,15 @@ const newsletterFormBlockRuntime = defineProgressiveBlockRuntime({
 		render: createZodCodec(newsletterRenderSchema)
 	},
 	buildRender: (source) => {
-		const runtimeSource = source.source === "block" ? deriveNewsletterSignupRuntimeSource(source) : null;
+		const targeting = source.targeting ?? { mode: "default" };
+		const presentation = planMailingListChoicePresentation(targeting);
 		return {
 			display: buildNewsletterDisplay(source),
 			hydration: {
 				target: projectNewsletterFormHydrationTarget(source),
-				preset: source.preset ?? "emailOnly",
-				includePhone: source.includePhone ?? false,
-				tags: runtimeSource ? runtimeSource.tags : source.tags,
+				setupRevision: source.mailingList?.tag === "configured" ? source.mailingList.revision : null,
+				choiceProvider: targeting.mode === "custom" ? targeting.provider : null,
+				choicePresentation: presentation.tag,
 				spamProtectionEnabled: source.spamProtectionEnabled
 			}
 		};
@@ -29045,35 +29432,87 @@ const newsletterFormBlockRuntime = defineProgressiveBlockRuntime({
 function projectNewsletterFormHydrationTarget(source) {
 	switch (source.source) {
 		case "block": {
-			const destinationRef = buildNewsletterSignupBlockRef(source.blockId);
-			if (destinationRef?.tag === "block_ref") return {
+			const sourceRef = buildMailingListSignupBlockSourceRef(source.blockId);
+			if (sourceRef?.tag === "block_ref") return {
 				tag: "block-source",
-				destinationRef
+				sourceRef
 			};
 			return {
-				tag: "legacy-direct-list",
-				listId: source.listId ?? null
+				tag: "block-source",
+				sourceRef: null
 			};
 		}
 		case "signed-footer": return {
 			tag: "signed-footer-source",
-			destinationRef: source.destinationRef
-		};
-		case "legacy-direct-list": return {
-			tag: "legacy-direct-list",
-			listId: source.listId
+			sourceRef: source.sourceRef
 		};
+		case "preview": return { tag: "preview" };
 		default: return assertNever$1(source);
 	}
 }
-function parseRequiredNewsletterSignupBlockId(value) {
-	const parsed = parseNewsletterSignupBlockId(value);
-	if (!parsed) throw new Error("Newsletter signup block destination ref requires blockId");
+function resolveRuntimeChoices(context, targeting) {
+	if (context?.tag !== "configured" || targeting.mode !== "custom" || targeting.selection.tag !== "visitor_choice" || context.provider.provider !== targeting.provider) return [];
+	switch (targeting.provider) {
+		case "native": {
+			const offered = new Set(targeting.selection.offeredTopicIds);
+			return context.provider.provider === "native" ? context.provider.topics.filter((item) => offered.has(item.id)).map((item) => ({
+				id: item.id,
+				label: item.name
+			})) : [];
+		}
+		case "brevo": {
+			const offered = new Set(targeting.selection.offeredListIds);
+			return context.provider.provider === "brevo" ? context.provider.lists.filter((item) => offered.has(item.id)).map((item) => ({
+				id: String(item.id),
+				label: item.name
+			})) : [];
+		}
+		case "mailchimp": {
+			const offered = new Set(targeting.selection.offeredInterestIds);
+			return (context.provider.provider === "mailchimp" ? context.provider.audiences.find((item) => item.id === targeting.audienceId) : void 0)?.interests.filter((item) => offered.has(item.id)).map((item) => ({
+				id: item.id,
+				label: item.name
+			})) ?? [];
+		}
+	}
+}
+function runtimeTargetingIsAvailable(context, targeting, choices) {
+	if (context?.tag !== "configured") return false;
+	const provider = context.provider;
+	if (targeting.mode === "default") switch (provider.provider) {
+		case "native": return provider.topics.some((item) => item.id === provider.defaultTopicId);
+		case "brevo": return provider.lists.some((item) => item.id === provider.defaultListId);
+		case "mailchimp": return provider.audiences.some((item) => item.id === provider.defaultAudienceId);
+	}
+	if (targeting.provider !== provider.provider) return false;
+	switch (targeting.provider) {
+		case "native": return provider.provider === "native" && nativeTargetIsAvailable(provider, targeting, choices);
+		case "brevo": return provider.provider === "brevo" && brevoTargetIsAvailable(provider, targeting, choices);
+		case "mailchimp": return provider.provider === "mailchimp" && mailchimpTargetIsAvailable(provider, targeting, choices);
+	}
+}
+function nativeTargetIsAvailable(provider, targeting, choices) {
+	const ids = targeting.selection.tag === "fixed" ? targeting.selection.topicIds : targeting.selection.offeredTopicIds;
+	return ids.every((id) => provider.topics.some((item) => item.id === id)) && (targeting.selection.tag !== "visitor_choice" || choices.length === ids.length);
+}
+function brevoTargetIsAvailable(provider, targeting, choices) {
+	const ids = targeting.selection.tag === "fixed" ? targeting.selection.listIds : targeting.selection.offeredListIds;
+	return ids.every((id) => provider.lists.some((item) => item.id === id)) && (targeting.selection.tag !== "visitor_choice" || choices.length === ids.length);
+}
+function mailchimpTargetIsAvailable(provider, targeting, choices) {
+	const audience = provider.audiences.find((item) => item.id === targeting.audienceId);
+	if (!audience) return false;
+	const ids = targeting.selection.tag === "fixed" ? targeting.selection.interestIds : targeting.selection.offeredInterestIds;
+	return ids.every((id) => audience.interests.some((item) => item.id === id)) && (targeting.selection.tag !== "visitor_choice" || choices.length === ids.length);
+}
+function parseRequiredMailingListSignupBlockId(value) {
+	const parsed = parseMailingListBlockId(value);
+	if (!parsed) throw new Error("Mailing-list signup block source ref requires blockId");
 	return parsed;
 }
-function parseRequiredSignedNewsletterDestinationRef(value) {
-	const parsed = parseSignedNewsletterDestinationRef(value);
-	if (!parsed) throw new Error("Newsletter signup signed destination ref requires token");
+function parseRequiredMailingListSignedSourceToken(value) {
+	const parsed = parseMailingListSignedSourceToken(value);
+	if (!parsed) throw new Error("Mailing-list signup signed source ref requires token");
 	return parsed;
 }
 //#endregion
@@ -30446,6 +30885,14 @@ const systemBlockDefinitions = [
 			weight: "standard"
 		})]
 	})),
+	withDesignCapability("block.appointment-services", appointmentServicesBlockDefinition, sectionOnly(), defineBlockDesignMetadata({
+		flow: conversionFlow,
+		layoutProfiles: [layoutProfile({
+			variantKey: "default",
+			family: "stack",
+			weight: "standard"
+		})]
+	})),
 	withDesignCapability("block.weekly-slot-availability", weeklySlotAvailabilityBlockDefinition, sectionOnly(), defineBlockDesignMetadata({
 		flow: offeringsFlow,
 		layoutProfiles: [layoutProfile({