@riverbankcms/sdk 0.144.0 → 0.146.0

package/dist/_dts/blocks/src/system/manifest/schema.d.ts

@@ -10,7 +10,7 @@ export type DisplayMediaKind = (typeof DISPLAY_MEDIA_KINDS)[number];
 export declare const DEFAULT_MEDIA_FIELD_KINDS: readonly ["image"];
 export declare const PUBLIC_FILE_FIELD_KINDS: readonly ["document", "spreadsheet", "archive", "audio"];
 export type FileFieldKind = (typeof PUBLIC_FILE_FIELD_KINDS)[number];
-export declare const siteOptionSources: readonly ["eventCategories", "eventSeries", "venues", "staffMembers"];
+export declare const siteOptionSources: readonly ["eventCategories", "eventSeries", "venues", "staffMembers", "appointmentServiceCategories"];
 export type SiteOptionSource = (typeof siteOptionSources)[number];
 declare const selectOptionSchema: z.ZodObject<{
     value: z.ZodString;
@@ -27,6 +27,7 @@ declare const selectSourceSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         eventCategories: "eventCategories";
         venues: "venues";
         staffMembers: "staffMembers";
+        appointmentServiceCategories: "appointmentServiceCategories";
     }>;
 }, z.core.$strip>, z.ZodObject<{
     kind: z.ZodLiteral<"sdk">;
@@ -210,6 +211,7 @@ declare const uiSchema: z.ZodObject<{
         eventCategories: "eventCategories";
         venues: "venues";
         staffMembers: "staffMembers";
+        appointmentServiceCategories: "appointmentServiceCategories";
     }>>>;
     searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
     renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -399,6 +401,7 @@ declare const baseFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -589,6 +592,7 @@ declare const textFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -782,6 +786,7 @@ declare const richTextFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -973,6 +978,7 @@ declare const inlineTextFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -1166,6 +1172,7 @@ declare const mediaFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -1366,6 +1373,7 @@ declare const fileFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -1563,6 +1571,7 @@ declare const booleanFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -1754,6 +1763,7 @@ declare const dateFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -1945,6 +1955,7 @@ declare const timeFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -2136,6 +2147,7 @@ declare const dateTimeFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -2327,6 +2339,7 @@ declare const slugFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -2521,6 +2534,7 @@ declare const urlFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -2713,6 +2727,7 @@ declare const linkFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -2904,6 +2919,7 @@ declare const selectFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -2934,6 +2950,7 @@ declare const selectFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>;
     }, z.core.$strip>, z.ZodObject<{
         kind: z.ZodLiteral<"sdk">;
@@ -3115,6 +3132,7 @@ declare const referenceFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -3318,6 +3336,7 @@ declare const repeaterFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -3526,6 +3545,7 @@ declare const groupFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -3720,6 +3740,7 @@ declare const modalFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -3914,6 +3935,7 @@ declare const numberFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -4108,6 +4130,7 @@ declare const tabGroupFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -4312,6 +4335,7 @@ declare const presetOrCustomFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -4512,6 +4536,7 @@ declare const contentTypeSelectFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -4708,6 +4733,7 @@ declare const entryPickerFieldSchema: z.ZodObject<{
             eventCategories: "eventCategories";
             venues: "venues";
             staffMembers: "staffMembers";
+            appointmentServiceCategories: "appointmentServiceCategories";
         }>>>;
         searchThreshold: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         renderInHeader: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -4933,8 +4959,8 @@ export declare const previewCustomizeManifestCurationSchema: z.ZodObject<{
 export type PreviewCustomizeManifestCuration = z.infer<typeof previewCustomizeManifestCurationSchema>;
 export declare const blockCategoryEnum: z.ZodEnum<{
     content: "content";
-    media: "media";
     layout: "layout";
+    media: "media";
     marketing: "marketing";
     blog: "blog";
     interactive: "interactive";
@@ -5050,8 +5076,8 @@ export declare const manifestSchema: z.ZodObject<{
     }, z.core.$strip>>>>;
     category: z.ZodOptional<z.ZodEnum<{
         content: "content";
-        media: "media";
         layout: "layout";
+        media: "media";
         marketing: "marketing";
         blog: "blog";
         interactive: "interactive";

package/dist/_dts/blocks/src/system/registry.d.ts

@@ -25,7 +25,7 @@ export type SystemBlockComponentProps<TContent = Record<string, unknown>> = {
     data?: Record<string, unknown>;
     pathBase?: string;
     blockId?: string | null;
-    contentVersionId?: string | null;
+    newsletterBlockSubmission?: ResolverContext['newsletterBlockSubmission'];
     blockKind?: string;
     blockBindings?: Record<string, unknown>;
     editableRouteMetadataFieldIds?: ResolverContext['editableRouteMetadataFieldIds'];

package/dist/_dts/blocks/src/system/runtime/hooks/useHeadlessBookingFlow.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { type BlockApiConfig } from "../api";
 import type { AutoAppliedDiscountPreview } from "../api/types";
-import type { BookingFormConfig, BookingFormData, BookingFormService, BookingSelectedCollectionOptionKind } from "../nodes/booking-form.state";
+import type { BookingFormConfig, BookingFormData, BookingFormService, BookingFormServiceCategory, BookingSelectedCollectionOptionKind } from "../nodes/booking-form.state";
 import { type BookingPaymentSelectionViewModel } from "../shared/bookingPaymentOptions";
 import { createBookingBlockApiConfig, type BookingAppointmentPackagesModel, type BookingFieldValue, type BookingFieldView, type BookingFlowActionResult, type BookingFlowFeedback, type BookingFlowStatus, type BookingFlowView, type BookingResourceView, type BookingFlowStep, type BookingFlowStepId, type BookingSlotSelection, type BookingSlotView, type BookingSubmitActionResult, type BookingSubmitOptions, getBookingServiceSlidingScale, type LoadState } from "./useHeadlessBookingFlow.state";
 export type { BlockApiConfig };
@@ -12,6 +12,11 @@ export type HeadlessBookingFlowOptions = Readonly<{
     formId: string;
     form: BookingFormConfig | null;
     services: readonly BookingFormService[];
+    /**
+     * The site's ordered service categories (issue 1403), used to group the
+     * service choice. Omitted or empty means a site without categories.
+     */
+    serviceCategories?: readonly BookingFormServiceCategory[];
     initialServiceId?: string;
     initialResourceId?: string;
     initialData?: Partial<BookingFormData>;
@@ -27,6 +32,8 @@ export type HeadlessBookingFlowOptions = Readonly<{
 }>;
 export type BookingServicesModel = Readonly<{
     items: readonly BookingFormService[];
+    /** Ordered service categories for grouping `items`; empty when the site has none. */
+    categories: readonly BookingFormServiceCategory[];
     selected: BookingFormService | null;
     defaultServiceId?: string;
     requiresSelection: boolean;

package/dist/_dts/blocks/src/system/runtime/nodes/appointment-services.d.ts

@@ -57,6 +57,7 @@ declare const publicAppointmentServiceSchema: z.ZodObject<{
             area: z.ZodNullable<z.ZodString>;
         }, z.core.$strip>>;
     }, z.core.$strip>], "mode">;
+    categoryId: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string | null, string | null | undefined>>;
 }, z.core.$strip>;
 type PublicAppointmentService = z.infer<typeof publicAppointmentServiceSchema>;
 export type AppointmentServiceRow = Readonly<{
@@ -69,9 +70,25 @@ export type AppointmentServiceRow = Readonly<{
     href: string;
     detailsHref: string | null;
 }>;
+/** One category (or the trailing "Other") with its heading, intro and rows. */
+export type AppointmentServiceGroup = Readonly<{
+    key: string;
+    heading: string;
+    intro: string | null;
+    rows: readonly AppointmentServiceRow[];
+}>;
+/**
+ * `items` is the flat list of a site with no categories, unchanged from before
+ * categories existed. `groups` is a categorised site: every non-empty
+ * category in order and then "Other", or the one category a block is
+ * filtered to.
+ */
 export type AppointmentServicesView = Readonly<{
     kind: 'items';
     rows: readonly AppointmentServiceRow[];
+}> | Readonly<{
+    kind: 'groups';
+    groups: readonly AppointmentServiceGroup[];
 }> | Readonly<{
     kind: 'empty';
     message: string;
@@ -81,18 +98,21 @@ export type AppointmentServicesView = Readonly<{
 }>;
 export type AppointmentServicesNodeProps = Readonly<{
     sectionHeading?: unknown;
+    categoryId?: unknown;
     services?: unknown;
     pathname?: unknown;
     servicePathPrefix?: unknown;
+    blockId?: string | null;
     className?: string | null;
 }>;
 export declare function formatAppointmentDuration(durationMinutes: number): string;
 export declare function formatAppointmentLocation(location: PublicAppointmentLocation): string | null;
-export declare function formatAppointmentPrice(service: PublicAppointmentService): string | null;
+export declare function formatAppointmentPrice(service: Pick<PublicAppointmentService, 'pricing' | 'priceAmount' | 'priceCurrency'>): string | null;
 export declare function buildAppointmentServicesView(input: Readonly<{
     services: unknown;
+    categoryId?: unknown;
     pathname: string | undefined;
     servicePathPrefix?: string | null;
 }>): AppointmentServicesView;
-export declare function AppointmentServicesNode({ sectionHeading, services, pathname, servicePathPrefix, className, }: AppointmentServicesNodeProps): React.ReactElement;
+export declare function AppointmentServicesNode({ sectionHeading, categoryId, services, pathname, servicePathPrefix, blockId, className, }: AppointmentServicesNodeProps): React.ReactElement;
 export default AppointmentServicesNode;

package/dist/_dts/blocks/src/system/runtime/nodes/booking-form.headless.state.d.ts

@@ -1,7 +1,7 @@
 import type { AppointmentResourceId, AppointmentServiceId, Brand, CustomerPassId, FormId, PassId, SiteId } from "../../../../../core/src/index";
 import type { BlockApiConfig, EligibleAppointmentPackage } from "../api/types";
 import type { TimeSlot } from "../api/types";
-import type { BookingFormConfig, BookingFormData, BookingFormField, BookingPaymentStepResolution, BookingFormServicesSource, BookingFormService, BookingSelectedCollectionOptionKind, BookingSubmissionData } from "./booking-form.state";
+import type { BookingFormConfig, BookingFormData, BookingFormField, BookingPaymentStepResolution, BookingFormServicesSource, BookingFormService, BookingFormServiceCategory, BookingSelectedCollectionOptionKind, BookingSubmissionData } from "./booking-form.state";
 import type { BookingValidationErrors } from "./booking-form.validationErrors";
 import { type BookingFieldValue } from "./booking-form.field-values";
 export type { BookingFieldValue } from "./booking-form.field-values";
@@ -416,6 +416,8 @@ export type AppointmentBookingOverrideInput = Readonly<{
     formId: FormId;
     form: BookingFormConfig;
     services: readonly BookingFormService[];
+    /** Ordered service categories (issue 1403); empty when the site has none. */
+    serviceCategories: readonly BookingFormServiceCategory[];
     initialServiceId?: AppointmentServiceId;
     initialResourceId?: AppointmentResourceId;
     requiresServiceSelection: boolean;

package/dist/_dts/blocks/src/system/runtime/nodes/booking-form.interactive.d.ts

@@ -1,7 +1,7 @@
 import { type InteractiveIslandProps } from "../../../contracts/islands";
-import { type BookingFormService, type BookingFormConfig, type BookingFormServicesSource } from "./booking-form.state";
+import { type BookingFormService, type BookingFormServiceCategory, type BookingFormConfig, type BookingFormServicesSource } from "./booking-form.state";
 import { type BookingFormRebookContext, type BookingFormSourceProps } from "./booking-runtime-sources";
-export type { BookingFormConfig, BookingFormService };
+export type { BookingFormConfig, BookingFormService, BookingFormServiceCategory };
 export type { BookingFormRebookContext, BookingFormSourceProps };
 export type BookingFormDisplay = Readonly<{
     kind: "booking-form";
@@ -23,6 +23,11 @@ export type BookingFormHydration = Readonly<{
     rebookContext?: BookingFormRebookContext | null;
     form: BookingFormConfig | null;
     services: readonly BookingFormService[];
+    /**
+     * The site's ordered service categories (issue 1403). Optional so a page
+     * rendered before categories existed still hydrates, as a site without any.
+     */
+    serviceCategories?: readonly BookingFormServiceCategory[];
     spamProtectionEnabled?: boolean;
 }>;
 type BookingFormIslandMeta = Readonly<{
@@ -143,6 +148,16 @@ export declare const bookingFormBlockRuntime: Readonly<{
                     agreement: import("../../../../../core/src/index").RichTextDoc;
                     checkboxLabel: string;
                 }>;
+                categoryId?: string | null;
+            }>[];
+            /**
+             * The site's ordered service categories (issue 1403). Optional so a page
+             * rendered before categories existed still hydrates, as a site without any.
+             */
+            serviceCategories?: readonly Readonly<{
+                id: string;
+                name: string;
+                description: string | null;
             }>[];
             spamProtectionEnabled?: boolean;
         }>;
@@ -302,6 +317,16 @@ export declare const bookingFormBlockRuntime: Readonly<{
                             agreement: import("../../../../../core/src/index").RichTextDoc;
                             checkboxLabel: string;
                         }>;
+                        categoryId?: string | null;
+                    }>[];
+                    /**
+                     * The site's ordered service categories (issue 1403). Optional so a page
+                     * rendered before categories existed still hydrates, as a site without any.
+                     */
+                    serviceCategories?: readonly Readonly<{
+                        id: string;
+                        name: string;
+                        description: string | null;
                     }>[];
                     spamProtectionEnabled?: boolean;
                 }>;
@@ -375,6 +400,16 @@ export declare const bookingFormBlockRuntime: Readonly<{
                             agreement: import("../../../../../core/src/index").RichTextDoc;
                             checkboxLabel: string;
                         }>;
+                        categoryId?: string | null;
+                    }>[];
+                    /**
+                     * The site's ordered service categories (issue 1403). Optional so a page
+                     * rendered before categories existed still hydrates, as a site without any.
+                     */
+                    serviceCategories?: readonly Readonly<{
+                        id: string;
+                        name: string;
+                        description: string | null;
                     }>[];
                     spamProtectionEnabled?: boolean;
                 }>;
@@ -460,6 +495,16 @@ export declare const bookingFormInteractiveIslandPropsCodec: Readonly<{
                         agreement: import("../../../../../core/src/index").RichTextDoc;
                         checkboxLabel: string;
                     }>;
+                    categoryId?: string | null;
+                }>[];
+                /**
+                 * The site's ordered service categories (issue 1403). Optional so a page
+                 * rendered before categories existed still hydrates, as a site without any.
+                 */
+                serviceCategories?: readonly Readonly<{
+                    id: string;
+                    name: string;
+                    description: string | null;
                 }>[];
                 spamProtectionEnabled?: boolean;
             }>;
@@ -542,6 +587,16 @@ export declare const bookingFormInteractiveIslandPropsCodec: Readonly<{
                         agreement: import("../../../../../core/src/index").RichTextDoc;
                         checkboxLabel: string;
                     }>;
+                    categoryId?: string | null;
+                }>[];
+                /**
+                 * The site's ordered service categories (issue 1403). Optional so a page
+                 * rendered before categories existed still hydrates, as a site without any.
+                 */
+                serviceCategories?: readonly Readonly<{
+                    id: string;
+                    name: string;
+                    description: string | null;
                 }>[];
                 spamProtectionEnabled?: boolean;
             }>;

package/dist/_dts/blocks/src/system/runtime/nodes/booking-form.service-categories.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Appointment-service categories in the booking block (issue 1403): the
+ * headings the service step groups its choices under.
+ */
+import type { ServiceCategorySummary } from "../../../../../core/src/index";
+import type { BookingFormService } from "./booking-form.state";
+/**
+ * The services a booking block was given. Only the catalogue shape
+ * `{ services, categories }` carries categories; the other shapes read as a
+ * site without categories.
+ */
+export type BookingFormServicesSource = readonly BookingFormService[] | Readonly<{
+    services?: readonly BookingFormService[];
+    categories?: readonly BookingFormServiceCategory[];
+}> | Readonly<Record<string, BookingFormService>>;
+/** A category heading in the service step: the shared category summary. */
+export type BookingFormServiceCategory = ServiceCategorySummary;
+/**
+ * The ordered service categories carried by a catalogue-shaped services
+ * source (`{ services, categories }`). Every other shape has none, which
+ * reads as a site without categories. Order is preserved: the database owns
+ * it.
+ */
+export declare function normalizeBookingServiceCategories(services: unknown): readonly BookingFormServiceCategory[];
+/**
+ * The ordered service categories a headless booking override was given in
+ * its loader data (`data.services`).
+ */
+export declare function readOverrideServiceCategories(data: unknown): readonly BookingFormServiceCategory[];

package/dist/_dts/blocks/src/system/runtime/nodes/booking-form.service-choices.d.ts

@@ -0,0 +1,13 @@
+import React from "react";
+import type { HeadlessBookingFlow } from "../hooks/useHeadlessBookingFlow";
+export declare function optionCardClassName(isSelected: boolean): string;
+export declare function SelectedCheck(): React.ReactElement;
+/**
+ * The service buttons. A site with no categories keeps its single grid; a
+ * categorised site gets a heading per category, then "Other", above the same
+ * grid (issue 1403). Empty categories are skipped, and there are no intros
+ * here, to keep the step compact.
+ */
+export declare function DefaultServiceChoices({ booking, }: Readonly<{
+    booking: HeadlessBookingFlow;
+}>): React.ReactElement;

package/dist/_dts/blocks/src/system/runtime/nodes/booking-form.state.d.ts

@@ -3,6 +3,7 @@ import { type BlockBookingConsent } from "../../blocks/shared/bookingConsent";
 import type { AppointmentBookingStatusResponse } from "../api/types";
 import type { BookingFormDataReservedKey } from "./booking-form.reserved-fields";
 import type { BookingFormField } from "./booking-form.fields";
+export type { BookingFormServiceCategory, BookingFormServicesSource, } from "./booking-form.service-categories";
 export type { BookingFormField, BookingFormFieldOption, StandardBookingFormField, } from "./booking-form.fields";
 export { APPOINTMENT_BOOKING_BLOCK_ID, BOOKING_FORM_DATA_RESERVED_KEYS, BOOKING_FORM_DATA_RESERVED_KEY_VALUES, collectBookingReservedFieldCollisions, findBookingFormDataReservedFieldCollisions, formatBookingReservedFieldCollisionMessages, formatBookingFormDataReservedFieldMessage, isBookingFormDataReservedKey, type BookingFormDataReservedKey, type BookingReservedFieldCollision, } from "./booking-form.reserved-fields";
 export type BookingFormSettings = Readonly<{
@@ -65,11 +66,10 @@ export type BookingFormService = Readonly<{
     paymentTerms?: BlockBookingPaymentTerms;
     paymentTermsAvailability?: BlockBookingPaymentTermsAvailability;
     consent?: BlockBookingConsent;
+    /** The service's category (issue 1403); null or absent is "Other". */
+    categoryId?: string | null;
 }>;
 export { projectSelectedAppointmentConsentIntoForm, resolveSelectedAppointmentConsent, type SelectedAppointmentConsent, } from "./booking-form.consent";
-export type BookingFormServicesSource = readonly BookingFormService[] | Readonly<{
-    services?: readonly BookingFormService[];
-}> | Readonly<Record<string, BookingFormService>>;
 export type BookingSelectedCollectionOptionKind = "upfront" | "deferred_manual" | "instalment_plan" | "flexible_balance";
 type BookingCustomFieldData<TCustomFieldId extends string> = Readonly<{
     [K in TCustomFieldId as K extends BookingFormDataReservedKey ? never : K]?: unknown;

package/dist/_dts/blocks/src/system/runtime/nodes/booking-runtime-sources.d.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import type { PublicEvent } from "../../blocks/events/shared/types";
-import type { StandardBookingFormField, BookingFormService, BookingFormServicesSource, BookingFormSettings, BookingFormSourceRecord } from "./booking-form.state";
+import type { StandardBookingFormField, BookingFormService, BookingFormServiceCategory, BookingFormServicesSource, BookingFormSettings, BookingFormSourceRecord } from "./booking-form.state";
 import type { EventRegistrationSourceProps } from "./event-registration.interactive";
 export declare const APPOINTMENT_BOOKING_RUNTIME_FORM_ID = "booking-form";
 export type BookingFormRebookContext = Readonly<{
@@ -97,12 +97,18 @@ export type AppointmentBookingServiceSourceInput = Readonly<{
     paymentTerms?: BookingFormService["paymentTerms"];
     paymentTermsAvailability?: BookingFormService["paymentTermsAvailability"];
     consent?: BookingFormService["consent"];
+    categoryId?: string | null;
 }>;
 export type AppointmentBookingSourceProps = BookingFormSourceProps & Readonly<{
     siteId: string;
     formId: string;
     form: BookingFormSourceRecord;
     services: BookingFormService[];
+    /**
+     * The site's ordered service categories (issue 1403). The booking island
+     * receives them beside the services as `{ services, categories }`.
+     */
+    serviceCategories: readonly BookingFormServiceCategory[];
     serviceId: string | null;
     resourceId: string | null;
     initialData: Readonly<Record<string, unknown>> | null;
@@ -137,6 +143,12 @@ export declare function buildAppointmentBookingSourceProps(input: Readonly<{
     previewToken?: string | null;
     form: AppointmentBookingFormSourceInput;
     services: readonly AppointmentBookingServiceSourceInput[];
+    /**
+     * Optional because the frontend and dashboard deploy separately: a
+     * services response from before categories (issue 1403) has none, and
+     * that must render the flat list rather than fail.
+     */
+    serviceCategories?: readonly BookingFormServiceCategory[];
     serviceId: string | null;
     resourceId: string | null;
     initialData: Readonly<Record<string, unknown>> | null;

package/dist/_dts/blocks/src/system/runtime/nodes/event-registration/eventSourceRecovery.d.ts

@@ -4,8 +4,8 @@ import type { PublicEventsRequest } from '../../api/types/events';
 export declare const eventRecoveryRequestSchema: z.ZodObject<{
     limit: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
     eventSurface: z.ZodOptional<z.ZodEnum<{
-        custom: "custom";
         all: "all";
+        custom: "custom";
         regularClassSchedule: "regularClassSchedule";
         specialDatedEvents: "specialDatedEvents";
     }>>;
@@ -36,6 +36,7 @@ export declare const eventRecoveryRequestSchema: z.ZodObject<{
     seriesSlug: z.ZodOptional<z.ZodString>;
     includeOccurrenceId: z.ZodOptional<z.ZodString>;
     readIntent: z.ZodOptional<z.ZodString>;
+    detailAdmission: z.ZodOptional<z.ZodString>;
     readProfile: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type EventRecoveryRequest = Omit<PublicEventsRequest, 'siteId'>;