@acms-subir/core 0.3.35 → 0.3.36

package/src/lib/mobile/schemas.ts

@@ -8,7 +8,7 @@ const Palette = z.object({ bg: str, ink: str, muted: str, line: str, accent: str
 export const Site = z.object({
   name: str, description: str, logo: str, logoDark: str, icon: str, menu: z.array(z.object({ label: str, href: str })),
   languages: z.object({ default: locale, locales: z.array(z.object({ code: str, name: str })) }),
-  features: z.object({ blog: z.array(z.object({ key: str, name: str, url: str, redirectFrom: strings })), calendar: bool, bookings: bool, search: bool, bookingChanges: bool, guestSignIn: bool, forms: bool, links: bool, live: bool, announcements: bool }),
+  features: z.object({ blog: z.array(z.object({ key: str, name: str, url: str, redirectFrom: strings })), calendar: bool, bookings: bool, rsvp: bool, search: bool, bookingChanges: bool, guestSignIn: bool, forms: bool, links: bool, live: bool, announcements: bool }),
   legal: z.object({ privacy: str.nullable(), terms: str.nullable() }), apiVersion: z.literal(1),
 });
 export const Theme = z.object({
@@ -68,6 +68,12 @@ export const Form = z.object({
   })),
 });
 export const FormReceipt = z.object({ received: z.literal(true), confirmation: str });
+export const RsvpStatus = z.object({
+  event: z.object({ id: str, slug: str, title: str }), start: date, end: date,
+  open: bool, reason: z.enum(['disabled', 'ended', 'cancelled', 'full']).nullable(),
+  going: z.number().int(), left: z.number().int().nullable(), capacity: z.number().int(), maxSeats: z.number().int(), autoConfirm: bool,
+  form: Form.omit({ id: true }).nullable(),
+});
 const GuestChanges = z.object({ cancel: bool, reschedule: bool, cutoffHours: z.number().int(), closed: bool });
 export const ManagedBooking = z.object({
   booking: z.object({
@@ -79,6 +85,8 @@ export const ManagedBooking = z.object({
   link: z.object({ slug: str, name: str, mode: z.enum(['slots', 'range', 'day']), lengths: z.array(z.number()) }).nullable(),
   event: z.object({ slug: str, title: str, url: str }).nullable(),
   manageUrl: str, can: GuestChanges,
+  // what the web page says once it's confirmed: the RSVP form's or booking type's message
+  confirmation: str.nullable(),
 });
 export const GuestCodeSent = z.object({ sent: z.literal(true), expiresInMinutes: z.number().int() });
 export const GuestToken = z.object({ accessToken: str, tokenType: z.literal('Bearer'), email: str, idleDays: z.number().int() });

package/src/lib/mobile/site.ts

@@ -37,7 +37,9 @@ export async function getSite(repo: ContentRepository, url: URL, _id = '', local
     features: {
       // redirectFrom: old addresses the website 301s to url, so apps can follow them too,
       // minus any another collection now lives at (the website serves that one first)
-      blog: Object.entries(CONTENT.collections).map(([key, c]) => ({ key, name: c.plural, url: safeUrl(c.base, origin), redirectFrom: legacyBases(key, c).filter(from => !bases.has(from)).map(from => safeUrl(from, origin)) })), calendar: CALENDAR.enabled, bookings: bookingsEnabled(), search: SEARCH.enabled,
+      blog: Object.entries(CONTENT.collections).map(([key, c]) => ({ key, name: c.plural, url: safeUrl(c.base, origin), redirectFrom: legacyBases(key, c).filter(from => !bases.has(from)).map(from => safeUrl(from, origin)) })), calendar: CALENDAR.enabled, bookings: bookingsEnabled(),
+      // RSVPs from apps (GET /events/{slug}/rsvp, POST /bookings) come with the calendar
+      rsvp: CALENDAR.enabled, search: SEARCH.enabled,
       // Admin → Mobile app → App access
       bookingChanges: CALENDAR.enabled && settings.mobileAccess.bookingChanges, guestSignIn: await guestSignInReady(repo, locals),
       forms: settings.mobileAccess.forms, links: settings.mobileAccess.links,

package/src/lib/schema.ts

@@ -672,7 +672,8 @@ export const Booking = z.object({
   formResponse: FormResponse.optional(),
   notes: z.string().default(''), // staff-only
   manageToken: z.string().default(''),
-  source: z.enum(['web', 'admin', 'api', 'agent']).default('web'),
+  // web: the website; app: the public app API (/api/v1/bookings)
+  source: z.enum(['web', 'app', 'admin', 'api', 'agent']).default('web'),
   reminderSentAt: z.number().nullable().default(null),
   notificationVersion: z.number().default(0),
   createdAt: z.number(),

package/src/lib/site-chrome.ts

@@ -8,6 +8,12 @@
 //   [data-scheme-toggle] flips light/dark (when site.schemeToggle is true)
 //   [data-menu-open]     opens the phone menu sheet (built from site.links)
 //   [data-live-header]   (hidden) becomes the "Live" link during a stream
+//
+// `words` are core's own labels in the page's language (skip link, menu and
+// dark-mode buttons, landmark and footer labels), so a custom header labels
+// its controls the same way the built-in one does.
+import type { SiteStrings } from './site-words';
+
 export interface ChromeLink {
   label: string;
   url: string;
@@ -32,4 +38,6 @@ export interface SiteChrome {
   liveHeader: boolean;
   headerStyle: string; // theme token `header`
   footerStyle: string; // theme token `footer`
+  lang: string; // the page's language, as on <html lang>
+  words: SiteStrings;
 }

package/src/pages/admin/calendar/bookings.astro

@@ -185,6 +185,8 @@ const emailNotice = !emailConfig.config.enabled || emailConfig.config.provider =
   : emailStatus.linkError;
 const TABS = [['upcoming', 'Upcoming'], ['unconfirmed', 'Needs approval'], ['past', 'Past'], ['cancelled', 'Cancelled']] as const;
 const statusLabel = (b: Booking) => (b.kind === 'block' ? 'Blocked' : b.status[0].toUpperCase() + b.status.slice(1));
+// where it was made: the website, an app (/api/v1/bookings), staff, an API key or the booking agent
+const SOURCES: Record<Booking['source'], string> = { web: 'Website', app: 'App', admin: 'Staff', api: 'API', agent: 'Agent' };
 const whenOf = (b: Booking) => (b.end - b.start >= 86_400_000 - 3_600_000 && ymd(b.start, tz) !== ymd(b.end - 1, tz)
   ? `${f.day.format(b.start)} – ${f.day.format(b.end - 1)}`
   : b.end - b.start >= 86_400_000 - 3_600_000 ? 'All day' : `${f.time.format(b.start)} – ${f.time.format(b.end)}`);
@@ -327,7 +329,7 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
               <div><dt>{ev ? 'Event' : 'Where'}</dt><dd>{ev ? <a href={eventUrl(ev.slug)} target="_blank" rel="noopener">{ev.title}</a> : r?.name ?? '—'}{l ? ` · ${l.name}` : ''}</dd></div>
               {b.seats > 1 && <div><dt>Seats</dt><dd>{b.seats}</dd></div>}
               {Object.entries(b.answers).map(([k, v]) => <div><dt>{k}</dt><dd>{v}</dd></div>)}
-              <div><dt>Booked</dt><dd>{f.day.format(b.createdAt)} · {b.source}</dd></div>
+              <div><dt>Booked</dt><dd>{f.day.format(b.createdAt)} · {SOURCES[b.source] ?? b.source}</dd></div>
             </dl>
             <form method="post" class="bk-notes">
               <input type="hidden" name="op" value="notes" /><input type="hidden" name="id" value={b.id} />

package/src/pages/api/v1/events/[slug]/rsvp.ts

@@ -0,0 +1,8 @@
+import { getRsvpStatus } from '../../../../../lib/mobile/rsvp';
+import { readRoute } from '../../../../../lib/mobile/route';
+import { methodNotAllowed } from '../../../../../lib/mobile/http';
+export { preflight as OPTIONS } from '../../../../../lib/mobile/http';
+// no-store: live seats; a cached "3 left" would invite RSVPs that fail
+export const GET = readRoute(getRsvpStatus, false);
+export const HEAD = GET;
+export const ALL = () => methodNotAllowed();

package/src/theme-sdk/index.ts

@@ -22,6 +22,8 @@ export interface SectionProps<D = Record<string, unknown>> { data: D; variant: s
 export type { LinkValue, EventItem, PostItem, PostAuthor, BookingItem } from '../lib/sections';
 /** Props for templates/header.astro and templates/footer.astro. */
 export type { SiteChrome, ChromeLink } from '../lib/site-chrome';
+// core's chrome labels for any language (a template already gets them as site.words)
+export { siteStrings, type SiteStrings } from '../lib/site-words';
 import type { SiteChrome } from '../lib/site-chrome';
 export interface ChromeProps { site: SiteChrome }