@acms-subir/core 0.3.5 → 0.3.7

package/src/lib/repo/sql.ts

@@ -1,3 +1,4 @@
+import { FormStore, formInsert, submissionInsert } from '../forms/store';
 import { LiveStore } from '../live/store';
 import { PushStore } from '../push/store';
 import { EditorStore } from '../editor/store';
@@ -5,7 +6,7 @@ import { LiveConfig } from '../live/types';
 import { ApiError } from '../api';
 import { EmailStore, bookingJobs } from '../email/store';
 import type { ContentRepository, DesignVersion, EventUpdate, ImportRecord, ImportRecordKind, ImportRun, SearchResults, Stats } from './types';
-import { DocTranslations, Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Calendar, CalEvent, ApiKey, Webhook, WebhookDelivery, Resource, BookingLink, Booking, isInternalTag, normalizeRedirectPath, publicTags, slugify, type WidgetInstance } from '../schema';
+import { DocTranslations, Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Calendar, CalEvent, ApiKey, Webhook, WebhookDelivery, Resource, BookingLink, Booking, Place, EventLocation, isInternalTag, normalizeRedirectPath, publicTags, slugify, type WidgetInstance } from '../schema';
 import { designSnapshot, draftNavItems, pickDesignDraft, pickEventDraft, pickPageDraft, pickPostDraft } from '../drafts';
 import { eventInstants, eventTimeZone, normalizeEventTimes } from '../calendar/events';
 import { cleanRrule } from '../calendar/rrule';
@@ -157,7 +158,15 @@ function rowToResource(r: Row): Resource {
     capacity: r.capacity === null || r.capacity === undefined ? null : Number(r.capacity),
     amenities: json(r.amenities, []), timezone: r.timezone ?? '', hours: json(r.hours, {}), overrides: json(r.overrides, []),
     busyFeeds: json(r.busy_feeds, []), notifyEmails: json(r.notify_emails, []), visibility: r.visibility ?? 'public',
-    showOnCalendar: Boolean(r.show_on_calendar), feedToken: r.feed_token ?? '', order: Number(r.ord ?? 0),
+    showOnCalendar: Boolean(r.show_on_calendar), feedToken: r.feed_token ?? '', placeId: r.place_id ?? '', order: Number(r.ord ?? 0),
+    createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
+  });
+}
+function rowToPlace(r: Row): Place {
+  const n = (v: unknown) => (v === null || v === undefined || v === '' ? null : Number(v));
+  return Place.parse({
+    id: r.id, name: r.name, address: r.address ?? '', url: r.url ?? '', lat: n(r.lat), lng: n(r.lng), notes: r.notes ?? '',
+    isDefault: Boolean(r.is_default), mapImage: r.map_image ?? '', mapImageDark: r.map_image_dark ?? '', order: Number(r.ord ?? 0),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
@@ -187,6 +196,7 @@ function rowToBooking(r: Row): Booking {
     id: r.id, kind: r.kind ?? 'booking', resourceId: r.resource_id ?? '', linkId: r.link_id ?? '', eventId: r.event_id ?? '',
     status: r.status, start: Number(r.start_at), end: Number(r.end_at), holdStart: Number(r.hold_start), holdEnd: Number(r.hold_end),
     timezone: r.timezone ?? '', name: r.name ?? '', email: r.email ?? '', phone: r.phone ?? '', seats: Number(r.seats ?? 1),
+    formResponse: r.form_response ? json(r.form_response, undefined) : undefined,
     answers: json(r.answers, {}), notes: r.notes ?? '', manageToken: r.manage_token ?? '', source: r.source ?? 'web',
     notificationVersion: Number(r.notification_version ?? 0), reminderSentAt: r.reminder_sent_at === null || r.reminder_sent_at === undefined ? null : Number(r.reminder_sent_at),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
@@ -248,12 +258,14 @@ export class SqlRepository implements ContentRepository {
   private driver!: SqlDriver;
   private ready: Promise<void>;
   readonly email: EmailStore;
+  readonly forms: FormStore;
   readonly live: LiveStore;
   readonly push: PushStore;
   readonly editor: EditorStore;
 
   constructor(driver: SqlDriver | (() => Promise<SqlDriver>)) {
     this.ready = this.init(driver);
+    this.forms = new FormStore(async () => { await this.ready; return this.driver; });
     this.live = new LiveStore(async () => { await this.ready; return this.driver; });
     this.push = new PushStore(async () => { await this.ready; return this.driver; });
     this.editor = new EditorStore(async () => { await this.ready; return this.driver; });
@@ -424,7 +436,7 @@ export class SqlRepository implements ContentRepository {
     await this.ready;
     // One SELECT snapshots bookings and their retry ledger together. No UI
     // list limit; include tombstones for deleted bookings as well.
-    const columns = ['id','kind','resource_id','link_id','event_id','status','start_at','end_at','hold_start','hold_end','timezone','name','email','phone','seats','answers','notes','manage_token','source','reminder_sent_at','notification_version','created_at','updated_at'];
+    const columns = ['id','kind','resource_id','link_id','event_id','status','start_at','end_at','hold_start','hold_end','timezone','name','email','phone','seats','answers','form_response','notes','manage_token','source','reminder_sent_at','notification_version','created_at','updated_at'];
     const rows = await this.driver.all(`SELECT 'booking' AS type, json_object(${columns.map(c => `'${c}',${c}`).join(',')}) AS data FROM bookings
       UNION ALL SELECT 'request', json_object('keyHash',key_hash,'requestHash',request_hash,'bookingId',booking_id,'createdAt',created_at) FROM mobile_booking_requests`);
     return {
@@ -931,14 +943,88 @@ export class SqlRepository implements ContentRepository {
   }
 
 
+  async setEventLocation(id: string, patch: Parameters<ContentRepository['setEventLocation']>[1]) {
+    await this.ready;
+    const current = await this.getEvent(id);
+    if (!current) return;
+    const stmts: SqlStatement[] = [];
+    if (patch.live) {
+      stmts.push({ sql: 'UPDATE events SET location = ?, updated_at = ? WHERE id = ?', args: [JSON.stringify(EventLocation.parse(patch.live)), Date.now(), id] });
+      if (patch.notify && current.status === 'published') {
+        // same fan-out as updateEvent's location change, minus the time math
+        stmts.push(
+          { sql: `UPDATE bookings SET notification_version=notification_version+1 WHERE event_id=? AND kind='rsvp' AND status IN ('pending','confirmed')`, args: [id] },
+          ...bookingJobs(id, 'updated').map((st) => ({ ...st, sql: st.sql.replace('b.id = ?', `b.event_id = ? AND b.kind='rsvp' AND b.status IN ('pending','confirmed')`) })),
+        );
+      }
+    }
+    if (patch.draft && current.draft) {
+      const draft = { ...current.draft, location: EventLocation.parse(patch.draft) };
+      stmts.push({ sql: 'UPDATE events SET draft = ? WHERE id = ?', args: [JSON.stringify(draft), id] });
+    }
+    if (!stmts.length) return;
+    await this.driver.batch(stmts);
+    if (patch.live) await this.syncEventIndex(id);
+  }
+
+  // ---- places ----
+  private placeInsert(p: Place): SqlStatement {
+    return {
+      sql: `INSERT INTO places (id, name, address, url, lat, lng, notes, is_default, map_image, map_image_dark, ord, created_at, updated_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      args: [p.id, p.name, p.address, p.url, p.lat, p.lng, p.notes, p.isDefault ? 1 : 0, p.mapImage, p.mapImageDark, p.order, p.createdAt, p.updatedAt],
+    };
+  }
+  async listPlaces() {
+    await this.ready;
+    return (await this.driver.all('SELECT * FROM places ORDER BY ord ASC, name COLLATE NOCASE ASC')).map(rowToPlace);
+  }
+  async getPlace(id: string) {
+    await this.ready;
+    const r = await this.first('SELECT * FROM places WHERE id = ?', [id]);
+    return r ? rowToPlace(r) : null;
+  }
+  async createPlace(data: Parameters<ContentRepository['createPlace']>[0]) {
+    await this.ready;
+    const now = Date.now();
+    const next = await this.first('SELECT COALESCE(MAX(ord), -1) + 1 AS n FROM places');
+    const p = Place.parse({ ...data, id: crypto.randomUUID(), order: Number(next?.n ?? 0), createdAt: now, updatedAt: now });
+    await this.driver.batch([
+      ...(p.isDefault ? [{ sql: 'UPDATE places SET is_default = 0 WHERE is_default = 1', args: [] }] : []),
+      this.placeInsert(p),
+    ]);
+    return p;
+  }
+  async updatePlace(id: string, data: Parameters<ContentRepository['updatePlace']>[1]) {
+    await this.ready;
+    const cur = await this.getPlace(id);
+    if (!cur) return;
+    const p = Place.parse({ ...cur, ...data, id, createdAt: cur.createdAt, updatedAt: Date.now() });
+    await this.driver.batch([
+      ...(p.isDefault ? [{ sql: 'UPDATE places SET is_default = 0 WHERE id != ? AND is_default = 1', args: [id] }] : []),
+      {
+        sql: `UPDATE places SET name = ?, address = ?, url = ?, lat = ?, lng = ?, notes = ?, is_default = ?, map_image = ?, map_image_dark = ?,
+          ord = ?, updated_at = ? WHERE id = ?`,
+        args: [p.name, p.address, p.url, p.lat, p.lng, p.notes, p.isDefault ? 1 : 0, p.mapImage, p.mapImageDark, p.order, p.updatedAt, id],
+      },
+    ]);
+  }
+  async deletePlace(id: string) {
+    await this.ready;
+    await this.driver.batch([
+      { sql: 'DELETE FROM places WHERE id = ?', args: [id] },
+      { sql: "UPDATE resources SET place_id = '' WHERE place_id = ?", args: [id] },
+    ]);
+  }
+
   // ---- resources + booking links ----
   private resourceInsert(r: Resource): SqlStatement {
     return {
       sql: `INSERT INTO resources (id, slug, name, kind, description, photo, capacity, amenities, timezone, hours, overrides, busy_feeds,
-        notify_emails, visibility, show_on_calendar, feed_token, ord, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        notify_emails, visibility, show_on_calendar, feed_token, ord, created_at, updated_at, place_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       args: [r.id, r.slug, r.name, r.kind, r.description, r.photo, r.capacity, JSON.stringify(r.amenities), r.timezone, JSON.stringify(r.hours),
         JSON.stringify(r.overrides), JSON.stringify(r.busyFeeds), JSON.stringify(r.notifyEmails), r.visibility, r.showOnCalendar ? 1 : 0,
-        r.feedToken || randomToken(), r.order, r.createdAt, r.updatedAt],
+        r.feedToken || randomToken(), r.order, r.createdAt, r.updatedAt, r.placeId],
     };
   }
   private linkInsert(l: BookingLink): SqlStatement {
@@ -955,9 +1041,9 @@ export class SqlRepository implements ContentRepository {
   private bookingInsert(b: Booking): SqlStatement {
     return {
       sql: `INSERT INTO bookings (id, kind, resource_id, link_id, event_id, status, start_at, end_at, hold_start, hold_end, timezone, name, email, phone,
-        seats, answers, notes, manage_token, source, reminder_sent_at, created_at, updated_at, notification_version) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        seats, answers, notes, manage_token, source, reminder_sent_at, created_at, updated_at, notification_version, form_response) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       args: [b.id, b.kind, b.resourceId, b.linkId, b.eventId, b.status, b.start, b.end, b.holdStart, b.holdEnd, b.timezone, b.name, b.email, b.phone,
-        b.seats, JSON.stringify(b.answers), b.notes, b.manageToken, b.source, b.reminderSentAt, b.createdAt, b.updatedAt, b.notificationVersion],
+        b.seats, JSON.stringify(b.answers), b.notes, b.manageToken, b.source, b.reminderSentAt, b.createdAt, b.updatedAt, b.notificationVersion, b.formResponse ? JSON.stringify(b.formResponse) : null],
     };
   }
   async listResources() {
@@ -989,10 +1075,10 @@ export class SqlRepository implements ContentRepository {
     const r = Resource.parse({ ...cur, ...data, id, updatedAt: Date.now() });
     await this.driver.run(
       `UPDATE resources SET slug = ?, name = ?, kind = ?, description = ?, photo = ?, capacity = ?, amenities = ?, timezone = ?, hours = ?,
-        overrides = ?, busy_feeds = ?, notify_emails = ?, visibility = ?, show_on_calendar = ?, feed_token = ?, updated_at = ? WHERE id = ?`,
+        overrides = ?, busy_feeds = ?, notify_emails = ?, visibility = ?, show_on_calendar = ?, feed_token = ?, place_id = ?, updated_at = ? WHERE id = ?`,
       [r.slug, r.name, r.kind, r.description, r.photo, r.capacity, JSON.stringify(r.amenities), r.timezone, JSON.stringify(r.hours),
         JSON.stringify(r.overrides), JSON.stringify(r.busyFeeds), JSON.stringify(r.notifyEmails), r.visibility, r.showOnCalendar ? 1 : 0,
-        r.feedToken, r.updatedAt, id]
+        r.feedToken, r.placeId, r.updatedAt, id]
     );
   }
   async reorderResources(ids: string[]) {
@@ -1615,7 +1701,7 @@ export class SqlRepository implements ContentRepository {
       // Suppression and re-enabling share the restore transaction. A failed
       // restore cannot leave notifications disabled or emit phantom deletes.
       { sql: 'UPDATE webhook_control SET suppressed=1 WHERE id=1' },
-      ...['email_jobs', 'email_attempts', 'email_delivery_events', 'email_tokens', 'posts', 'pages', 'media', 'links', 'tags', 'nav_items', 'users', 'post_authors', 'redirects', 'calendars', 'events', 'resources', 'booking_links', 'bookings', 'mobile_booking_requests', 'import_runs', 'import_records'].map((t) => ({
+      ...['email_jobs', 'email_attempts', 'email_delivery_events', 'email_tokens', 'posts', 'pages', 'media', 'links', 'tags', 'nav_items', 'users', 'post_authors', 'redirects', 'calendars', 'events', 'resources', 'booking_links', 'bookings', 'mobile_booking_requests', 'import_runs', 'import_records', 'places', 'forms', 'form_submissions'].map((t) => ({
         sql: `DELETE FROM ${t}`,
       })),
       ...(content.calendars ?? []).map((c) => ({
@@ -1635,7 +1721,10 @@ export class SqlRepository implements ContentRepository {
           JSON.stringify(e.rsvp ?? {}), JSON.stringify(e.roomHold ?? {}),
         ],
       })),
+      ...(content.forms ?? []).map(formInsert),
+      ...(content.formSubmissions ?? []).map(submissionInsert),
       ...(content.resources ?? []).map((r) => this.resourceInsert(r)),
+      ...(content.places ?? []).map((p) => this.placeInsert(p)),
       ...(content.bookingLinks ?? []).map((l) => this.linkInsert(l)),
       ...(content.bookings ?? []).map((b) => this.bookingInsert(b)),
       ...(content.bookingRequests ?? []).map(r => ({ sql: 'INSERT INTO mobile_booking_requests (key_hash,request_hash,booking_id,created_at) VALUES (?,?,?,?)', args: [r.keyHash,r.requestHash,r.bookingId,r.createdAt] })),
@@ -1839,6 +1928,7 @@ export class SqlRepository implements ContentRepository {
       activeTheme: r?.active_theme ?? '', designOverrides: JSON.parse(String(r?.design_overrides ?? '{}')),
       sectionPages: JSON.parse(String(r?.section_pages ?? '{}')), designRevision: Number(r?.design_revision ?? 0),
       siteLogo: r?.site_logo ?? '',
+      siteLogoDark: r?.site_logo_dark ?? '',
       siteUrl: r?.site_url ?? '', siteFavicon: r?.site_favicon ?? '', siteCover: r?.site_cover ?? '',
       announcement: JSON.parse(String(r?.announcement ?? '{}')),
       analytics: JSON.parse(String(r?.analytics ?? '{}')),
@@ -1862,14 +1952,14 @@ export class SqlRepository implements ContentRepository {
   private settingsStatement(data: Partial<Settings>): SqlStatement | undefined {
     const columns: Record<string, string> = {
       siteTitle:'site_title', tagline:'tagline', footerText:'footer_text', linksName:'links_name', linksBio:'links_bio', linksAvatar:'links_avatar',
-      activeTheme:'active_theme', designOverrides:'design_overrides', sectionPages:'section_pages', siteLogo:'site_logo', siteUrl:'site_url', siteFavicon:'site_favicon', siteCover:'site_cover',
+      activeTheme:'active_theme', designOverrides:'design_overrides', sectionPages:'section_pages', siteLogo:'site_logo', siteLogoDark:'site_logo_dark', siteUrl:'site_url', siteFavicon:'site_favicon', siteCover:'site_cover',
       announcement:'announcement', analytics:'analytics', headCode:'head_code', footerCode:'footer_code', timezone:'timezone', locale:'locale',
       draftsApiKey:'drafts_api_key', draftsAllowedOrigins:'drafts_allowed_origins', draftDesign:'draft_design', ai:'ai', agent:'agent', live:'live', push:'push', calendar:'calendar',
     };
     const jsonKeys = new Set(['designOverrides','sectionPages','announcement','analytics','draftsAllowedOrigins','draftDesign','ai','agent','live','push','calendar']);
     const entries = Object.entries(data).filter(([k,v]) => columns[k] && v !== undefined);
     if (!entries.length) return;
-    const design = entries.some(([k]) => ['activeTheme','designOverrides','sectionPages','siteLogo','siteFavicon','siteCover','draftDesign'].includes(k));
+    const design = entries.some(([k]) => ['activeTheme','designOverrides','sectionPages','siteLogo','siteLogoDark','siteFavicon','siteCover','draftDesign'].includes(k));
     return { sql: `UPDATE settings SET ${entries.map(([k]) => `${columns[k]} = ?`).join(', ')}${design ? ', design_revision = design_revision + 1' : ''} WHERE id = 1`,
       args: entries.map(([k,v]) => jsonKeys.has(k) && v !== null ? JSON.stringify(v) : v) };
   }
@@ -1919,8 +2009,8 @@ export class SqlRepository implements ContentRepository {
     const statements: SqlStatement[] = [
       { sql: 'INSERT INTO design_versions (id,created_at,author,summary,snapshot) VALUES (?,?,?,?,?)', args: [crypto.randomUUID(), Date.now(), opts.author ?? '', opts.summary ?? '', JSON.stringify(designSnapshot(current, liveNav))] },
       { sql: 'DELETE FROM design_versions WHERE id NOT IN (SELECT id FROM design_versions ORDER BY created_at DESC LIMIT 20)' },
-      { sql: 'UPDATE settings SET active_theme=?,design_overrides=?,section_pages=?,site_logo=?,site_favicon=?,site_cover=?,draft_design=NULL WHERE id=1',
-        args: [design.activeTheme, JSON.stringify(design.designOverrides), JSON.stringify(design.sectionPages), design.siteLogo, design.siteFavicon, design.siteCover] },
+      { sql: 'UPDATE settings SET active_theme=?,design_overrides=?,section_pages=?,site_logo=?,site_logo_dark=?,site_favicon=?,site_cover=?,draft_design=NULL WHERE id=1',
+        args: [design.activeTheme, JSON.stringify(design.designOverrides), JSON.stringify(design.sectionPages), design.siteLogo, design.siteLogoDark, design.siteFavicon, design.siteCover] },
     ];
     if (nav) statements.push({ sql: 'DELETE FROM nav_items' }, ...nav.map((n,i) => ({
       sql: 'INSERT INTO nav_items (id,label,url,area,ord) VALUES (?,?,?,?,?)', args: [n.id.startsWith('tmp-') ? crypto.randomUUID() : n.id,n.label,n.url,n.area,i],

package/src/lib/repo/types.ts

@@ -1,3 +1,5 @@
+import type { FormStore } from '../forms/store';
+import type { SavedForm, FormSubmission } from '../forms/schema';
 import type { LiveStore } from '../live/store';
 import type { BookingRequest } from '../backup/content';
 import type { EmailStore } from '../email/store';
@@ -8,7 +10,7 @@ export type ImportRecordKind = 'post' | 'page' | 'user' | 'tag' | 'media' | 'red
 export interface ImportRecord { runId: string; kind: ImportRecordKind; sourceId: string; acmsId: string; action: 'created' | 'updated'; stamp: number }
 export interface DesignVersion { id: string; createdAt: number; author: string; summary: string; snapshot: Record<string, unknown> }
 
-import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Role, WidgetInstance, Calendar, CalEvent, ApiKey, ApiScope, Webhook, WebhookDelivery, Resource, BookingLink, Booking, BookingStatus } from '../schema';
+import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Role, WidgetInstance, Calendar, CalEvent, ApiKey, ApiScope, Webhook, WebhookDelivery, Resource, BookingLink, Booking, BookingStatus, Place, EventLocation } from '../schema';
 
 export interface Stats {
   publishedPages: number;
@@ -48,6 +50,7 @@ export type EventUpdate = Partial<
 // this — never a concrete adapter.
 export interface ContentRepository {
   readonly email: EmailStore;
+  readonly forms: FormStore;
   readonly live: LiveStore;
   readonly push: PushStore;
   readonly editor: EditorStore;
@@ -131,6 +134,19 @@ export interface ContentRepository {
   applyEventDraft(id: string): Promise<void>;
   discardEventDraft(id: string): Promise<void>;
   deleteEvent(id: string): Promise<void>;
+  // saved-place sync (lib/maps/places.ts): rewrite just the location of the
+  // live row and/or the staged draft, leaving every other field — and the
+  // draft itself — alone. notify = RSVP guests of a published event get an
+  // "event updated" email (the address changed).
+  setEventLocation(id: string, patch: { live?: EventLocation; draft?: EventLocation; notify?: boolean }): Promise<void>;
+
+  // saved places. Only one can be the default (saving one as default clears
+  // the others). Deleting a place unlinks its rooms; events keep their copy.
+  listPlaces(): Promise<Place[]>;
+  getPlace(id: string): Promise<Place | null>;
+  createPlace(data: Partial<Omit<Place, 'id' | 'createdAt' | 'updatedAt' | 'order'>> & { name: string }): Promise<Place>;
+  updatePlace(id: string, data: Partial<Omit<Place, 'id' | 'createdAt' | 'updatedAt'>>): Promise<void>;
+  deletePlace(id: string): Promise<void>;
 
   // resources (rooms, people, vans…) and their booking links. Deleting a
   // resource deletes its links; its bookings stay as history.
@@ -265,6 +281,10 @@ export interface ContentRepository {
     bookingLinks?: BookingLink[];
     bookings?: Booking[];
     bookingRequests?: BookingRequest[];
+    // added with maps support; older backups restore with none
+    places?: Place[];
+    forms?: SavedForm[];
+    formSubmissions?: FormSubmission[];
   }): Promise<void>;
 
   // imports (lib/import/apply.ts drives these). writeImported is the
@@ -292,7 +312,7 @@ export interface ContentRepository {
   updateSettings(data: Partial<Settings>): Promise<void>;
   // Design-screen staging: save stages into settings.draftDesign, apply
   // copies staged → live design fields and clears, discard just clears
-  saveDesignDraft(data: Partial<Pick<Settings, 'activeTheme' | 'designOverrides' | 'siteLogo' | 'siteFavicon' | 'siteCover' | 'sectionPages'>> & {
+  saveDesignDraft(data: Partial<Pick<Settings, 'activeTheme' | 'designOverrides' | 'siteLogo' | 'siteLogoDark' | 'siteFavicon' | 'siteCover' | 'sectionPages'>> & {
     navItems?: { id: string; label: string; url: string; area: NavItem['area'] }[];
     shareEpoch?: string;
   }): Promise<void>;

package/src/lib/schema.ts

@@ -3,6 +3,7 @@ import { PushSettings } from './push/types';
 import { SectionPages } from '../theme-sdk/contract.mjs';
 import { AiConfig, AgentConfig } from './ai-schema';
 import { z } from 'zod';
+import { FormDefinition, FormResponse } from './forms/schema';
 
 // ---- Widgets -------------------------------------------------------------
 // Each widget type has a zod config schema; pages store an ordered array of
@@ -304,6 +305,18 @@ export const EventLocation = z.object({
   address: z.string().default(''),
   // a map link or an online-meeting URL
   url: z.string().default(''),
+  // the pin, when known (picked from suggestions, parsed from a map link,
+  // or copied from a saved place); null = no pin, so no map image
+  lat: z.number().nullable().default(null),
+  lng: z.number().nullable().default(null),
+  // the saved place this was picked from ('' = typed by hand). The fields
+  // above are a copy; saving the place refreshes upcoming events' copies.
+  placeId: z.string().default(''),
+  // show the static map image on the public event page
+  showMap: z.boolean().default(true),
+  // cached static map images (media URLs) for the current pin; '' = none
+  mapImage: z.string().default(''),
+  mapImageDark: z.string().default(''),
 });
 export type EventLocation = z.infer<typeof EventLocation>;
 
@@ -365,6 +378,7 @@ export const CalEvent = z.object({
     capacity: z.number().int().default(0),
     autoConfirm: z.boolean().default(true),
     maxSeats: z.number().int().default(4),
+    form: FormDefinition.optional(),
   }).default({}),
   // rooms/people this event uses: they can't be booked while it happens (or
   // all day). Computed into availability, never stored as bookings. Drafts
@@ -439,12 +453,35 @@ export const Resource = z.object({
   showOnCalendar: z.boolean().default(false),
   // secret for the staff feed /book/<slug>.ics?t=… (bookings with names)
   feedToken: z.string().default(''),
+  // the saved place this room is in ('' = none)
+  placeId: z.string().default(''),
   order: z.number().default(0),
   createdAt: z.number(),
   updatedAt: z.number(),
 });
 export type Resource = z.infer<typeof Resource>;
 
+// A saved place (HQ, the park pavilion…): picked in an event's Where field,
+// it copies its details into the event. Rooms can belong to one (resource.placeId).
+export const Place = z.object({
+  id: z.string(),
+  name: z.string(),
+  address: z.string().default(''),
+  url: z.string().default(''),
+  lat: z.number().nullable().default(null),
+  lng: z.number().nullable().default(null),
+  // shown to editors only ("Use the side door")
+  notes: z.string().default(''),
+  // new events start here
+  isDefault: z.boolean().default(false),
+  mapImage: z.string().default(''),
+  mapImageDark: z.string().default(''),
+  order: z.number().default(0),
+  createdAt: z.number(),
+  updatedAt: z.number(),
+});
+export type Place = z.infer<typeof Place>;
+
 export const QUESTION_TYPES = ['text', 'textarea', 'email', 'phone', 'number', 'select', 'checkbox', 'date'] as const;
 export const BookingQuestion = z.object({
   id: z.string(),
@@ -549,6 +586,7 @@ export const Booking = z.object({
   phone: z.string().default(''),
   seats: z.number().int().default(1),
   answers: z.record(z.string()).default({}),
+  formResponse: FormResponse.optional(),
   notes: z.string().default(''), // staff-only
   manageToken: z.string().default(''),
   source: z.enum(['web', 'admin', 'api', 'agent']).default('web'),
@@ -650,6 +688,7 @@ export const Settings = z.object({
   sectionPages: SectionPages.default({}),
   designRevision: z.number().int().nonnegative().default(0),
   siteLogo: z.string().default(''),
+  siteLogoDark: z.string().default(''),
   // SEO foundation: canonical origin for absolute URLs (sitemap, feeds, OG
   // tags — empty falls back to the request origin), favicon, and the default
   // social-share image used when a post has no cover

package/src/lib/site-chrome.ts

@@ -19,6 +19,7 @@ export interface SiteChrome {
   title: string;
   tagline: string;
   logo: string; // '' when the site has no logo
+  logoDark: string; // '' when unset; themes can fall back to logo
   homeUrl: string;
   links: ChromeLink[]; // header navigation
   footerLinks: ChromeLink[];

package/src/lib/umami.ts

@@ -21,6 +21,7 @@ export interface TrafficSummary {
 }
 
 const TTL = 10 * 60_000;
+const CACHE_MAX = 32;
 const cache = new Map<string, { at: number; value: TrafficSummary | null }>();
 
 function config(settings: Settings) {
@@ -97,7 +98,13 @@ export async function getTraffic(settings: Settings, days = 30): Promise<Traffic
   } catch {
     value = null;
   }
-  cache.set(cacheKey, { at: Date.now(), value });
+  // Expiry controls freshness, not retention. Bound old site/range keys in
+  // long-lived Node processes as well as short-lived Worker isolates.
+  const now = Date.now();
+  for (const [key, entry] of cache) if (now - entry.at >= TTL) cache.delete(key);
+  cache.delete(cacheKey);
+  cache.set(cacheKey, { at: now, value });
+  if (cache.size > CACHE_MAX) cache.delete(cache.keys().next().value!);
   return value;
 }
 

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

@@ -1,11 +1,13 @@
 ---
+import { csv } from '../../../lib/forms/service';
+import { readForm } from '../../../lib/forms/http';
 import Admin from '../../../layouts/Admin.astro';
 import BookingsHead from '../../../components/calendar/BookingsHead.astro';
 import { eventHolds } from '../../../lib/booking/holds';
 import Modal from '../../../components/Modal.astro';
 import { getRepo } from '../../../lib/repo';
 import type { Booking, BookingStatus } from '../../../lib/schema';
-import { bookingsEnabled, eventUrl } from '../../../lib/calendar/config';
+import { CALENDAR, bookingsEnabled, eventUrl } from '../../../lib/calendar/config';
 import { createBlock, createResourceBooking, rescheduleBooking, setBookingStatus, BookingError } from '../../../lib/booking/service';
 import { addDaysYmd, localMidnight, ymd } from '../../../lib/booking/availability';
 import { fmt } from '../../../lib/booking/view';
@@ -16,7 +18,7 @@ import { waitUntilFrom } from '../../../lib/webhooks';
 // Bookings (mockup I): Cal.com-style tabs, an agenda by day with pending
 // requests first, a Day view with one column per resource, a details panel
 // (?b=<id>) with private notes, plus Block time and Add booking.
-if (!bookingsEnabled()) return new Response(null, { status: 404 });
+if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const settings = await repo.getSettings();
 const tz = settings.timezone || 'UTC';
@@ -43,10 +45,11 @@ let notice = Astro.url.searchParams.get('notice') ?? '';
 let error = '';
 
 if (Astro.request.method === 'POST') {
-  const form = await Astro.request.formData();
+  const form = await readForm(Astro.request);
   const op = String(form.get('op'));
   const id = String(form.get('id') || '');
   try {
+    if (!bookingsEnabled() && ['block', 'add', 'reschedule'].includes(op)) throw new BookingError(400, 'Resource bookings are disabled.');
     if (op === 'status') {
       const b = await repo.getBooking(id);
       if (!b) throw new BookingError(404, 'Booking not found.');
@@ -104,9 +107,10 @@ if (Astro.request.method === 'POST') {
 // ---- data ----
 const tab = (['upcoming', 'unconfirmed', 'past', 'cancelled'] as const).find((t) => t === Astro.url.searchParams.get('tab')) ?? 'upcoming';
 const view = Astro.url.searchParams.get('view') === 'day' ? 'day' : 'agenda';
+const eventFilter = Astro.url.searchParams.get('event') ?? '';
 const resFilter = Astro.url.searchParams.get('r') ?? '';
 const q = (Astro.url.searchParams.get('q') ?? '').trim().toLowerCase();
-const all = await repo.listBookings({ from: now - 400 * 86_400_000 });
+const all = await repo.listBookings({ from: now - 400 * 86_400_000, ...(eventFilter ? { eventId: eventFilter } : {}), ...(!bookingsEnabled() ? { kinds: ['rsvp'] } : {}) });
 const titleOf = (b: Booking) =>
   b.kind === 'block' ? `Blocked${b.notes ? ` · ${b.notes}` : ''}`
   : b.kind === 'rsvp' ? b.name
@@ -116,6 +120,7 @@ const contextOf = (b: Booking) =>
   : [linkById.get(b.linkId)?.name, ...Object.values(b.answers).slice(0, 2)].filter(Boolean).join(' · ');
 const where = (b: Booking) => (b.kind === 'rsvp' ? evById.get(b.eventId)?.location.name || 'Event' : resById.get(b.resourceId)?.name ?? '—');
 const matches = (b: Booking) =>
+  (!eventFilter || b.eventId === eventFilter) &&
   (!resFilter || b.resourceId === resFilter) &&
   (!q || `${b.name} ${b.email} ${b.phone} ${where(b)} ${contextOf(b)}`.toLowerCase().includes(q));
 const active = (b: Booking) => b.status === 'pending' || b.status === 'confirmed';
@@ -131,15 +136,14 @@ const list = all
   .sort((a, b) => (tab === 'past' || tab === 'cancelled' ? b.start - a.start : a.start - b.start))
   .slice(0, 300);
 if (Astro.url.searchParams.get('format') === 'csv') {
-  const cell = (v: string) => (/[",\n]/.test(v) ? `"${v.replace(/"/g, '""')}"` : v);
   const iso = (ms: number) => new Date(ms).toISOString();
   const keys = [...new Set(list.flatMap((b) => Object.keys(b.answers)))];
   const rows = [
     ['Start', 'End', 'Status', 'Kind', 'Resource / event', 'Link', 'Name', 'Email', 'Phone', 'Seats', ...keys, 'Notes', 'Booked'],
     ...list.map((b) => [iso(b.start), iso(b.end), b.status, b.kind, where(b), linkById.get(b.linkId)?.name ?? '', b.name, b.email, b.phone, String(b.seats), ...keys.map((k) => b.answers[k] ?? ''), b.notes, iso(b.createdAt)]),
   ];
-  return new Response(rows.map((r) => r.map(cell).join(',')).join('\n'), {
-    headers: { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="bookings-${tab}.csv"` },
+  return new Response(csv(rows), {
+    headers: { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="bookings-${tab}.csv"`, 'Cache-Control': 'private, no-store' },
   });
 }
 const pending = tab === 'upcoming' ? list.filter((b) => b.status === 'pending') : [];
@@ -190,6 +194,7 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
     <a class="btn" href={keep({ format: 'csv', b: null, notice: null })}>Export</a>
   </BookingsHead>
   {notice && <p class="notice" role="status">{notice}</p>}
+  {eventFilter && <p class="notice">Registrations for {evById.get(eventFilter)?.title ?? 'this event'} · <a href={keep({ event: null })}>Show all bookings</a></p>}
   {error && <p class="notice warn" role="alert">{error}</p>}
   {provider === 'none' && <p class="notice"><span>Emails are off — set <code>EMAIL_FROM</code> plus <code>RESEND_API_KEY</code> (or a Cloudflare <code>send_email</code> binding named EMAIL) so guests get confirmations and reminders.</span></p>}
 

package/src/pages/admin/calendar/events/[id].astro

@@ -8,14 +8,16 @@ import { BRAND } from '../../../../lib/brand';
 import { CALENDAR, eventUrl } from '../../../../lib/calendar/config';
 import { mergeEventDraft } from '../../../../lib/drafts';
 import { safeColor } from '../../../../lib/calendar/events';
+import { mapsStatus } from '../../../../lib/maps/config';
 import ThemeScript from '../../../../components/ThemeScript.astro';
 import PostEditor from '../../../../components/editor/PostEditor';
 import '../../../../styles/admin.css';
 import '../../../../styles/editor.css';
 
 // The shared writing surface in event mode: same cards, autosave, preview and
-// publish flow as posts, plus the When / Repeats / Where / Button / Calendars
-// sidebar. Live events stage edits until Update, like posts.
+// publish flow as posts, with the event's settings (When · Where ·
+// Registration · Organize) on the page above its content. Live events stage
+// edits until Update, like posts.
 if (!CALENDAR.enabled) return new Response(null, { status: 404, statusText: 'Not found' });
 
 const repo = await getRepo(Astro.locals);
@@ -59,6 +61,7 @@ const trDrafts = trLanguages.length > 0 && translationEngine((await repo.getSett
       calendars={calendars.filter((c) => c.kind === 'native').map((c) => ({ id: c.id, name: c.name, color: safeColor(c.color) }))}
       eventFields={CALENDAR.eventFields}
       siteTimezone={settings.timezone}
+      maps={mapsStatus(Astro.locals)}
       site={{ title: settings.siteTitle, url: settings.siteUrl }}
     />
   </body>

package/src/pages/admin/calendar/events/index.astro

@@ -9,6 +9,7 @@ import { getRepo } from '../../../../lib/repo';
 import { slugify, type Status } from '../../../../lib/schema';
 import { CALENDAR, eventUrl } from '../../../../lib/calendar/config';
 import { featuredOccurrence, formatOccurrence, locationLine, safeColor } from '../../../../lib/calendar/events';
+import { defaultPlaceLocation } from '../../../../lib/maps/places';
 import { describeRepeat } from '../../../../lib/calendar/rrule';
 import { expandVEvents, loadFeed, tzParts } from '../../../../lib/calendar/ics';
 import { normalizeCalendarSrc } from '../../../../lib/calendar/src';
@@ -71,9 +72,11 @@ if (Astro.request.method === 'POST') {
     const today = tzParts(now + 86_400_000, tz);
     const day = /^\d{4}-\d{2}-\d{2}$/.test(date) ? date : `${today.y}-${String(today.m).padStart(2, '0')}-${String(today.d).padStart(2, '0')}`;
     const start = /^\d{2}:\d{2}$/.test(time) ? `${day}T${time}` : day;
+    const place = await defaultPlaceLocation(repo);
     const event = await repo.createEvent({
       title, slug: await uniqueSlug(title), start, allDay: !/^\d{2}:\d{2}$/.test(time),
       calendarIds: calendarId && (await repo.getCalendar(calendarId))?.kind === 'native' ? [calendarId] : [],
+      ...(place ? { location: place } : {}),
     });
     return Astro.redirect(`/admin/calendar/events/${event.id}`);
   }

package/src/pages/admin/calendar/resources/[id].astro

@@ -26,6 +26,9 @@ let notice = Astro.url.searchParams.has('created') ? 'Created. Set its hours, th
 let error = '';
 const token = () => btoa(String.fromCharCode(...crypto.getRandomValues(new Uint8Array(18)))).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
 
+// saved places (Calendar settings → Places): which building this room is in
+const places = await repo.listPlaces();
+
 if (Astro.request.method === 'POST') {
   const form = await Astro.request.formData();
   const op = String(form.get('op'));
@@ -48,6 +51,7 @@ if (Astro.request.method === 'POST') {
       timezone: tz && isValidTimeZone(tz) ? tz : '',
       visibility: form.get('visibility') === 'unlisted' ? 'unlisted' : 'public',
       showOnCalendar: Boolean(form.get('showOnCalendar')),
+      placeId: places.some((p) => p.id === form.get('placeId')) ? String(form.get('placeId')) : '',
       hours: hoursFromForm(form), overrides: overridesFromForm(form), busyFeeds, notifyEmails: emails,
     });
     notice = error ? '' : 'Saved.';
@@ -160,6 +164,13 @@ const ovRows = [...resource.overrides, { date: '', endDate: '', ranges: [], labe
         <label class="field"><span>Description</span><textarea name="description" rows="3">{resource.description}</textarea></label>
         <label class="field"><span>Photo URL</span><input type="text" class="mono" name="photo" value={resource.photo} placeholder="/media/… or https://…" /></label>
         <label class="field"><span>Amenities <em class="hint">comma-separated</em></span><input type="text" name="amenities" value={resource.amenities.join(', ')} placeholder="Kitchen, Projector, Accessible" /></label>
+        <label class="field"><span>Place</span>
+          <select name="placeId">
+            <option value="">{places.length ? 'Not set' : 'No saved places yet'}</option>
+            {places.map((p) => <option value={p.id} selected={resource.placeId === p.id}>{p.name}{p.address ? ` — ${p.address}` : ''}</option>)}
+          </select>
+          <small class="hint">The building or venue it’s in. Add places in <a href="/admin/calendar/settings#places">Calendar settings</a>.</small>
+        </label>
         <label class="field"><span>Timezone</span><input type="text" name="timezone" value={resource.timezone} placeholder={`${settings.timezone || 'UTC'} (site default)`} /></label>
         <label class="field">
           <span>Listed</span>