@riverbankcms/sdk 0.140.0 → 0.141.0

package/dist/server/data.mjs

@@ -2487,7 +2487,7 @@ const BUTTON_CONTRAST_POLICY = {
 	nonTextMinimumRatio: 3,
 	gradientSamplesPerSegment: 20,
 	alphaBackgrounds: "reject-without-known-surface",
-	disabled: "retain-full-colour-contract"
+	disabled: "validated-colour-pair-with-muted-control-opacity"
 };
 function validateButtonSurfaceContrast(input) {
 	const ratio = contrastRatio(input.buttonPaint, input.surfaceHex);
@@ -8303,6 +8303,7 @@ const calendarWindowQuerySchema = 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()
@@ -16980,6 +16981,7 @@ function isDisplayMediaKind(kind) {
 }
 const siteOptionSources = [
 	"eventCategories",
+	"eventSeries",
 	"venues",
 	"staffMembers"
 ];
@@ -27851,7 +27853,8 @@ const appointmentServicesBlockDefinition = {
 				el("appointment-services", {
 					sectionHeading: { $bind: { from: "content.heading" } },
 					services: { $bind: { from: "data.services" } },
-					pathname: { $bind: { from: "$root.pathname" } }
+					pathname: { $bind: { from: "$root.pathname" } },
+					servicePathPrefix: { $bind: { from: "$root.appointmentServicePathPrefix" } }
 				})
 			], { gap: "lg" })
 		})]
@@ -29392,6 +29395,35 @@ const eventSpotlightBlockDefinition = {
 	} }
 };
 //#endregion
+//#region ../blocks/src/system/blocks/events/shared/eventSelection.ts
+/** Invalid saved selections fail closed rather than widening discovery. */
+function resolveEventSelection(mode, value) {
+	if (mode !== "selected") return { kind: "matching" };
+	const candidates = Array.isArray(value) ? value : typeof value === "string" ? value.split(",").filter(Boolean) : [];
+	const ids = [];
+	for (const candidate of candidates) {
+		if (typeof candidate !== "string") return {
+			kind: "selected",
+			seriesIds: []
+		};
+		const parsed = parseEventSeriesId(candidate.trim());
+		if (!parsed.ok) return {
+			kind: "selected",
+			seriesIds: []
+		};
+		ids.push(parsed.value);
+	}
+	return {
+		kind: "selected",
+		seriesIds: [...new Set(ids)].sort()
+	};
+}
+/** Undefined means discovery; an empty string is an explicitly empty selection. */
+function eventSeriesScopeCsv(value) {
+	if (value == null) return void 0;
+	return typeof value === "string" ? value : value.join(",");
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/events/shared/listingLayout.ts
 /**
 * Layout classes for event listing containers and cards. Presentation
@@ -29491,6 +29523,7 @@ const eventCollectionFilterSourceSchemaShape = {
 	eventSurface: eventSurfaceScopeSchema$1.nullable().optional(),
 	filterEventPresets: z.union([z.string(), z.array(z.string())]).nullable().optional(),
 	scheduleScope: eventScheduleScopeSchema$1.nullable().optional(),
+	seriesIds: z.union([z.string(), z.array(z.string())]).nullable().optional(),
 	filterCategoryIds: z.union([z.string(), z.array(z.string())]).nullable().optional(),
 	filterStaffMemberId: z.string().nullable().optional(),
 	filterVenueId: z.string().nullable().optional()
@@ -29537,6 +29570,7 @@ const eventCollectionDisplaySchemaShape = {
 	eventSurface: eventSurfaceScopeSchema$1,
 	filterEventPresets: z.string().nullable(),
 	scheduleScope: eventScheduleScopeSchema$1,
+	seriesIds: z.string().nullable().optional(),
 	filterCategoryIds: z.string().nullable(),
 	filterStaffMemberId: z.string().nullable(),
 	filterVenueId: z.string().nullable(),
@@ -29584,11 +29618,15 @@ function buildEventCollectionDisplay(source) {
 	};
 }
 function buildEventCollectionFilterDisplay(source) {
-	return {
-		showFilters: source.showFilters ?? true,
-		showCategoryFilter: source.showCategoryFilter ?? "auto",
-		showVenueFilter: source.showVenueFilter ?? false,
-		showStaffFilter: source.showStaffFilter ?? true,
+	const selected = source.seriesIds != null;
+	const matchingFilters = selected ? {
+		eventSurface: "all",
+		filterEventPresets: null,
+		scheduleScope: "any",
+		filterCategoryIds: null,
+		filterStaffMemberId: null,
+		filterVenueId: null
+	} : {
 		eventSurface: normalizeEventSurfaceScope(source.eventSurface),
 		filterEventPresets: normalizeEventSurfacePresetsCsv(source.filterEventPresets),
 		scheduleScope: normalizeEventScheduleScope(source.scheduleScope),
@@ -29596,6 +29634,14 @@ function buildEventCollectionFilterDisplay(source) {
 		filterStaffMemberId: normalizeEventStaffMemberId(source.filterStaffMemberId),
 		filterVenueId: normalizeEventVenueId(source.filterVenueId)
 	};
+	return {
+		seriesIds: eventSeriesScopeCsv(source.seriesIds),
+		showFilters: selected ? false : source.showFilters ?? true,
+		showCategoryFilter: source.showCategoryFilter ?? "auto",
+		showVenueFilter: source.showVenueFilter ?? false,
+		showStaffFilter: source.showStaffFilter ?? true,
+		...matchingFilters
+	};
 }
 function buildEventCollectionPresentationDisplay(source) {
 	return {
@@ -29610,14 +29656,15 @@ function buildEventCollectionPresentationDisplay(source) {
 }
 function buildEventCollectionHydration(source, now = /* @__PURE__ */ new Date()) {
 	const timeZone = source.calendarWindow?.scope.timeZone ?? toBookingTimeZone(source.bookingTimeZone);
+	const selected = source.seriesIds != null;
 	return {
 		calendarWindow: source.calendarWindow ?? void 0,
 		siteId: source.siteId,
 		stage: source.stage,
 		prefetchedEvents: source.events != null,
-		eventSurface: normalizeEventSurfaceScope(source.eventSurface),
-		filterEventPresets: normalizeEventSurfacePresetsCsv(source.filterEventPresets),
-		scheduleScope: normalizeEventScheduleScope(source.scheduleScope),
+		eventSurface: selected ? "all" : normalizeEventSurfaceScope(source.eventSurface),
+		filterEventPresets: selected ? null : normalizeEventSurfacePresetsCsv(source.filterEventPresets),
+		scheduleScope: selected ? "any" : normalizeEventScheduleScope(source.scheduleScope),
 		calendarContext: {
 			timeZone,
 			initialToday: source.calendarWindow?.initialToday ?? getLocalScheduleDate(now, timeZone)
@@ -29683,6 +29730,7 @@ const eventListingHydrationSchema = z.object({
 	eventSurface: eventSurfaceScopeSchema,
 	filterEventPresets: z.string().nullable(),
 	scheduleScope: eventScheduleScopeSchema,
+	seriesIds: z.string().nullable().optional(),
 	filterCategoryIds: z.string().nullable().optional(),
 	filterStaffMemberId: z.string().nullable().optional(),
 	filterVenueId: z.string().nullable().optional(),
@@ -29743,6 +29791,7 @@ const eventListingBlockRuntime = defineProgressiveBlockRuntime({
 				eventSurface: normalizeEventSurfaceScope(source.eventSurface),
 				filterEventPresets: normalizeEventSurfacePresetsCsv(source.filterEventPresets),
 				scheduleScope: normalizeEventScheduleScope(source.scheduleScope),
+				seriesIds: eventSeriesScopeCsv(source.seriesIds),
 				filterCategoryIds: normalizeEventCategoryIdsCsv(source.filterCategoryIds),
 				filterStaffMemberId: normalizeEventStaffMemberId(source.filterStaffMemberId),
 				filterVenueId: normalizeEventVenueId(source.filterVenueId),
@@ -30116,6 +30165,65 @@ const eventListingBlockDefinition = {
 	} }
 };
 //#endregion
+//#region ../blocks/src/system/blocks/events/eventSelectionFields.ts
+const eventSelectionFields = [{
+	id: "eventSelection",
+	type: "select",
+	label: "Events to show",
+	required: false,
+	multiple: false,
+	defaultValue: "matching",
+	options: [{
+		value: "matching",
+		label: "All matching events"
+	}, {
+		value: "selected",
+		label: "Selected events"
+	}],
+	ui: { intent: "behavior" }
+}, createSiteOptionSelectField({
+	id: "selectedEventSeriesIds",
+	label: "Selected events",
+	description: "Show upcoming dates for these events. Other event filters do not apply.",
+	required: false,
+	multiple: true,
+	defaultValue: [],
+	optionSource: "eventSeries",
+	ui: {
+		intent: "behavior",
+		searchThreshold: 1,
+		visibleWhen: {
+			field: "eventSelection",
+			equals: "selected"
+		}
+	}
+})];
+function withEventSelectionVisibility(field) {
+	if (![
+		"eventSurface",
+		"filterEventPresets",
+		"scheduleScope",
+		"filterCategoryIds",
+		"filterStaffMemberId",
+		"filterVenueId",
+		"showFilters",
+		"showCategoryFilter",
+		"showVenueFilter",
+		"showStaffFilter"
+	].includes(field.id)) return field;
+	const visibleWhen = field.ui?.visibleWhen;
+	return {
+		...field,
+		ui: {
+			...field.ui,
+			visibleWhen: { allOf: [{
+				field: "eventSelection",
+				notEquals: "selected"
+			}, ...visibleWhen ? [visibleWhen] : []] }
+		}
+	};
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/events/EventCalendar.interactive.ts
 const eventCalendarSourceSchema = z.object({
 	...eventCollectionSourceSchemaShape,
@@ -30198,19 +30306,59 @@ const eventCalendarBlockRuntime = defineProgressiveBlockRuntime({
 //#region ../blocks/src/system/blocks/events/eventCalendarDataLoaders.ts
 const scopeParams = {
 	siteId: { $bind: { from: "$root.siteId" } },
+	seriesIds: { $bind: {
+		from: "content",
+		transforms: [{
+			id: "events.calendarSelectionParam",
+			options: { key: "seriesIds" }
+		}]
+	} },
 	stage: { $bind: {
 		from: "$root.previewStage",
 		fallback: "published"
 	} },
-	eventSurface: { $bind: { from: "content.eventSurface" } },
+	eventSurface: { $bind: {
+		from: "content",
+		transforms: [{
+			id: "events.calendarSelectionParam",
+			options: { key: "eventSurface" }
+		}, { id: "value.csv" }]
+	} },
 	eventPresets: { $bind: {
-		from: "content.filterEventPresets",
-		transforms: [{ id: "value.csv" }]
+		from: "content",
+		transforms: [{
+			id: "events.calendarSelectionParam",
+			options: { key: "filterEventPresets" }
+		}, { id: "value.csv" }]
+	} },
+	scheduleScope: { $bind: {
+		from: "content",
+		transforms: [{
+			id: "events.calendarSelectionParam",
+			options: { key: "scheduleScope" }
+		}, { id: "value.csv" }]
+	} },
+	categoryIds: { $bind: {
+		from: "content",
+		transforms: [{
+			id: "events.calendarSelectionParam",
+			options: { key: "filterCategoryIds" }
+		}, { id: "value.csv" }]
 	} },
-	scheduleScope: { $bind: { from: "content.scheduleScope" } },
-	categoryIds: { $bind: { from: "content.filterCategoryIds" } },
-	staffMemberId: { $bind: { from: "content.filterStaffMemberId" } },
-	venueId: { $bind: { from: "content.filterVenueId" } }
+	staffMemberId: { $bind: {
+		from: "content",
+		transforms: [{
+			id: "events.calendarSelectionParam",
+			options: { key: "filterStaffMemberId" }
+		}, { id: "value.csv" }]
+	} },
+	venueId: { $bind: {
+		from: "content",
+		transforms: [{
+			id: "events.calendarSelectionParam",
+			options: { key: "filterVenueId" }
+		}, { id: "value.csv" }]
+	} }
 };
 /** Combined renders two jobs; calendar-only variants never pay for the list seed. */
 const eventCalendarDataLoaders = {
@@ -30340,6 +30488,13 @@ const eventCalendarLayout = [styledSection({
 				from: "content.defaultCalendarView",
 				fallback: "month"
 			} },
+			seriesIds: { $bind: {
+				from: "content",
+				transforms: [{
+					id: "events.calendarSelectionParam",
+					options: { key: "seriesIds" }
+				}]
+			} },
 			showFilters: { $bind: {
 				from: "content.showFilters",
 				fallback: true
@@ -30361,17 +30516,47 @@ const eventCalendarLayout = [styledSection({
 				fallback: true
 			} },
 			eventSurface: { $bind: {
-				from: "content.eventSurface",
-				fallback: "all"
+				from: "content",
+				transforms: [{
+					id: "events.calendarSelectionParam",
+					options: { key: "eventSurface" }
+				}]
+			} },
+			filterEventPresets: { $bind: {
+				from: "content",
+				transforms: [{
+					id: "events.calendarSelectionParam",
+					options: { key: "filterEventPresets" }
+				}]
 			} },
-			filterEventPresets: { $bind: { from: "content.filterEventPresets" } },
 			scheduleScope: { $bind: {
-				from: "content.scheduleScope",
-				fallback: "any"
+				from: "content",
+				transforms: [{
+					id: "events.calendarSelectionParam",
+					options: { key: "scheduleScope" }
+				}]
+			} },
+			filterCategoryIds: { $bind: {
+				from: "content",
+				transforms: [{
+					id: "events.calendarSelectionParam",
+					options: { key: "filterCategoryIds" }
+				}]
+			} },
+			filterStaffMemberId: { $bind: {
+				from: "content",
+				transforms: [{
+					id: "events.calendarSelectionParam",
+					options: { key: "filterStaffMemberId" }
+				}]
+			} },
+			filterVenueId: { $bind: {
+				from: "content",
+				transforms: [{
+					id: "events.calendarSelectionParam",
+					options: { key: "filterVenueId" }
+				}]
 			} },
-			filterCategoryIds: { $bind: { from: "content.filterCategoryIds" } },
-			filterStaffMemberId: { $bind: { from: "content.filterStaffMemberId" } },
-			filterVenueId: { $bind: { from: "content.filterVenueId" } },
 			cardRole: { $bind: {
 				from: "content._cardStyles.role",
 				fallback: "default"
@@ -30875,6 +31060,7 @@ const eventCalendarAdditionalFields = [
 			}
 		}
 	},
+	...eventSelectionFields,
 	{
 		id: "eventSurface",
 		type: "select",
@@ -31084,7 +31270,7 @@ const eventCalendarBlockDefinition = {
 		titleSource: "heading",
 		description: "Display events with calendar, list, or combined views with filtering",
 		skipSectionStyles: true,
-		additionalFields: eventCalendarAdditionalFields,
+		additionalFields: eventCalendarAdditionalFields.map(withEventSelectionVisibility),
 		styleTokens: {
 			background: "surface",
 			typography: "body",
@@ -37729,6 +37915,26 @@ const linksTransforms = [{
 	}
 }];
 const defaultTransforms = createTransformRegistry([
+	{
+		id: "events.calendarSelectionParam",
+		kind: "formatter",
+		summary: "Resolve selected events instead of discovery filters",
+		schema: z.object({ key: z.enum([
+			"seriesIds",
+			"eventSurface",
+			"filterEventPresets",
+			"scheduleScope",
+			"filterCategoryIds",
+			"filterStaffMemberId",
+			"filterVenueId"
+		]) }),
+		run(value, { key }) {
+			const content = asPartialObject(value) ?? {};
+			const selection = resolveEventSelection(content.eventSelection, content.selectedEventSeriesIds);
+			if (selection.kind === "selected") return key === "seriesIds" ? selection.seriesIds : void 0;
+			return key === "seriesIds" ? void 0 : content[key];
+		}
+	},
 	{
 		id: "events.calendarReadEnabled",
 		kind: "formatter",
@@ -38043,12 +38249,12 @@ function normalizeContent(block) {
 }
 /**
 * Normalize params for API calls.
-* Converts all values to strings.
+* Converts supplied values to strings, preserving absent versus explicitly empty params.
 */
 function normalizeParams(input) {
 	if (!input || typeof input !== "object") return {};
 	const output = {};
-	for (const [key, value] of Object.entries(input)) output[key] = coerceToString(value);
+	for (const [key, value] of Object.entries(input)) if (value !== void 0 && value !== null) output[key] = coerceToString(value);
 	return output;
 }
 function isNonArrayObject(value) {
@@ -38112,6 +38318,14 @@ function coercePayload(payload) {
 * - Frontend: provide internal API client
 * - SDK: provide SDK client with endpoint mapping
 */
+function projectDataLoaders(loaders, shouldLoad, blockId, blockKind) {
+	if (!shouldLoad) return [...loaders];
+	return loaders.filter(({ key }) => shouldLoad({
+		blockId,
+		blockKind,
+		loaderKey: key
+	}));
+}
 function shouldSkipResolvedLoader(input) {
 	if (input.loader.requiredParams?.some((param) => !input.params[param]?.trim())) return true;
 	return Boolean(input.isValidEndpoint && !input.isValidEndpoint(input.endpoint));
@@ -38140,7 +38354,7 @@ async function prefetchBlockData$1(page, context, options) {
 	return (await prefetchBlockDataWithFailures(page, context, options)).resolvedData;
 }
 async function prefetchBlockDataWithFailures(page, context, options) {
-	const { apiClient, isValidEndpoint, onError, getCustomBlockLoaders, getBlockDefinition: getBlockDefinition$1 = getBlockDefinition, resolveParamsBindings: resolveParamsBindings$1 = resolveParamsBindings } = options;
+	const { apiClient, isValidEndpoint, onError, getCustomBlockLoaders, getBlockDefinition: getBlockDefinition$1 = getBlockDefinition, resolveParamsBindings: resolveParamsBindings$1 = resolveParamsBindings, shouldLoad } = options;
 	const results = {};
 	const loaderFailures = {};
 	const tasks = [];
@@ -38157,6 +38371,7 @@ async function prefetchBlockDataWithFailures(page, context, options) {
 				loader
 			})) : [];
 		} else loaders = [];
+		loaders = projectDataLoaders(loaders, shouldLoad, blockId, block.kind);
 		if (loaders.length === 0) continue;
 		const root = {
 			...context.root ?? {},
@@ -38235,8 +38450,8 @@ function toStringParams(value) {
 	for (const [k, v] of Object.entries(value)) if (typeof v === "string") out[k] = v;
 	return out;
 }
-function stripEmptyStringValues(params) {
-	for (const [key, value] of Object.entries(params)) if (value === "") delete params[key];
+function stripEmptyStringValues(params, endpoint) {
+	for (const [key, value] of Object.entries(params)) if (value === "" && !(key === "seriesIds" && (endpoint === "listPublicEvents" || endpoint === "listPublicEventCalendarWindow"))) delete params[key];
 }
 function ensureSiteId(params, context) {
 	if (!params.siteId && typeof context.siteId === "string" && context.siteId) params.siteId = context.siteId;
@@ -38249,7 +38464,7 @@ function ensureSiteId(params, context) {
 */
 function normalizeLoaderParams(endpoint, params, context) {
 	const out = toStringParams(params);
-	stripEmptyStringValues(out);
+	stripEmptyStringValues(out, endpoint);
 	if (endpoint === "getPublicFormById") {
 		ensureSiteId(out, context);
 		if (!out.formId && out.formSlug) {

package/dist/server/index.mjs

@@ -8280,7 +8280,7 @@ var SimpleCache = class {
 * 1. This constant
 * 2. The "version" field in package.json
 */
-const SDK_VERSION = "0.140.0";
+const SDK_VERSION = "0.141.0";
 //#endregion
 //#region src/client/error.ts
 let _Symbol$for;