@acms-subir/core 0.3.50 → 0.3.51

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @acms-subir/core
 
+## 0.3.51
+
+### Patch Changes
+
+- 1efe99e: Section event items (an events source, as theme sections and the apps' native sections receive them) carry `rooms`: the public rooms each date holds, as `{ slug, name, color }`. A moved date lists its own rooms, and only rooms set to "Name it on public events" are included, with `color` `null` when a room has none. A Classes card can now name the room without staff typing it into the place. `upcomingEvents()` in the theme SDK returns `rooms` too, as `{ id, slug, name, color }`. The library's Upcoming events section shows "Moved · " before a moved date, with "Moved from …" and the note. `EventItem` and its sibling types now live in `lib/section-items.ts`, which has no imports, and `EventItemRoom` is exported from `@acms-subir/core/theme`.
+
+  The app API's `event.repeats` (`/api/v1/events`, `/api/v1/events/:slug` and search) now follows `?locale=`: "Todos los sábados, hasta el 1 jun 2030" instead of always English. Without a locale it uses the site's main language, and the until date is written in that language too. `eventToJson` takes a `locale` option for it. The REST API and webhooks keep English.
+
 ## 0.3.50
 
 ### Patch Changes

package/docs/theme-authoring.md

@@ -55,7 +55,7 @@ const date = new Intl.DateTimeFormat('en', { dateStyle: 'medium', timeZone: Astr
 </section>}
 ```
 
-`calendarConfig()` returns a fresh `{ enabled, base, eventsBase }` object; `eventUrl(slug)` uses the configured event base. `upcomingEvents(Astro, options?)` resolves storage through `Astro.locals` and loads the site's timezone settings. It returns the next or ongoing occurrence of each distinct published, publicly listed native event, soonest first, including recurring and all-day events. Private/unlisted calendars and external feed entries are excluded; cancelled public events remain visible so templates can label them, and a date moved to another time carries `moved` (`{ from: { start, end }, note }`) so templates can say "Moved from …". `tag` keeps only events with that tag and `excludeTag` leaves them out (a tag's name in any case, or its slug), e.g. `upcomingEvents(Astro, { tag: 'Class' })` for a Classes page. Disabled calendars and a zero limit return `[]` without accessing storage. Storage errors propagate to the template.
+`calendarConfig()` returns a fresh `{ enabled, base, eventsBase }` object; `eventUrl(slug)` uses the configured event base. `upcomingEvents(Astro, options?)` resolves storage through `Astro.locals` and loads the site's timezone settings. It returns the next or ongoing occurrence of each distinct published, publicly listed native event, soonest first, including recurring and all-day events. Private/unlisted calendars and external feed entries are excluded; cancelled public events remain visible so templates can label them, and a date moved to another time carries `moved` (`{ from: { start, end }, note }`) so templates can say "Moved from …". `rooms` lists the public rooms each date holds (`{ id, slug, name, color }`, only rooms set to show on public events). Section `EventItem`s from an events source carry `moved` (`{ from: "Thu, Oct 1 · 6:00 PM", note }` or `null`) and `rooms` (`{ slug, name, color }[]`, `color` `null` when the room has none). `tag` keeps only events with that tag and `excludeTag` leaves them out (a tag's name in any case, or its slug), e.g. `upcomingEvents(Astro, { tag: 'Class' })` for a Classes page. Disabled calendars and a zero limit return `[]` without accessing storage. Storage errors propagate to the template.
 
 Options default to `{ limit: 6, horizonDays: 400 }`. The limit must be a non-negative safe integer and the horizon a positive finite number. Each `UpcomingEvent` contains `{ event, start, end, allDay, days }`, with start/end in Unix milliseconds. Format occurrence timestamps using the site's timezone rather than the authored `event.start` when displaying recurring events. `UpcomingEvent`, `UpcomingEventsOptions`, and `ThemeCalendarConfig` are exported types.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.50",
+  "version": "0.3.51",
   "publishConfig": {
     "access": "public"
   },

package/section-library/upcoming-events/UpcomingEvents.astro

@@ -24,8 +24,9 @@ const fit = data.imageFit === 'contain' ? 'contain' : 'cover';
               ? <a class="upev-media" href={e.url} tabindex="-1" aria-hidden="true"><img src={image.src} alt="" loading="lazy" /></a>
               : <span class="upev-date" aria-hidden="true"><b>{e.day}</b>{e.month}</span>}
             <div class="upev-body">
-              <span class="upev-when">{e.cancelled ? 'Cancelled · ' : ''}{e.when}</span>
+              <span class="upev-when">{e.cancelled ? 'Cancelled · ' : e.moved ? 'Moved · ' : ''}{e.when}</span>
               <h3 class="upev-title"><a href={e.url}>{e.title}</a></h3>
+              {!e.cancelled && e.moved && <span class="upev-moved">Moved from {e.moved.from}{e.moved.note ? ` · ${e.moved.note}` : ''}</span>}
               {data.showSummary && e.summary && <p class="upev-summary">{e.summary}</p>}
               {data.showLocation !== false && e.location && <span class="upev-loc">{e.location}</span>}
             </div>
@@ -59,5 +60,6 @@ const fit = data.imageFit === 'contain' ? 'contain' : 'cover';
   .upev-title a { color: inherit; text-decoration: none; }
   .upev-title a:hover { text-decoration: underline; }
   .upev-loc { font-size: 0.9rem; color: var(--muted); }
+  .upev-moved { font-size: 0.9rem; color: var(--accent, inherit); }
   .is-cancelled .upev-title { text-decoration: line-through; opacity: 0.7; }
 </style>

package/src/lib/calendar/api.ts

@@ -59,8 +59,16 @@ export function roomsToJson(ids: string[], resources: Map<string, Resource> | un
 
 const abs = (origin: string, path: string) => (/^https?:\/\//.test(path) ? path : origin + path);
 
-// resources: every room by id (rooms stay [] without it)
-export function eventToJson(e: CalEvent, origin: string, calendars: Map<string, Calendar>, siteTz = '', opts: { includePrivate?: boolean; resources?: Map<string, Resource> } = {}): EventJson {
+// a repeat's "until" date in that language ("12 jun 2027")
+const untilDate = (locale: string) => (ymd: string) => {
+  const [y, m, d] = ymd.split('-').map(Number);
+  try { return new Date(Date.UTC(y, m - 1, d)).toLocaleDateString(locale, { month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' }); }
+  catch { return ymd; }
+};
+
+// resources: every room by id (rooms stay [] without it); locale: the
+// language of the repeat line ("Cada semana el sábado"; English without it)
+export function eventToJson(e: CalEvent, origin: string, calendars: Map<string, Calendar>, siteTz = '', opts: { includePrivate?: boolean; resources?: Map<string, Resource>; locale?: string } = {}): EventJson {
   return {
     id: e.id,
     slug: e.slug,
@@ -76,7 +84,7 @@ export function eventToJson(e: CalEvent, origin: string, calendars: Map<string,
     allDay: e.allDay,
     timezone: e.timezone || siteTz || 'UTC',
     rrule: e.rrule,
-    repeats: describeRepeat(e.rrule, e.start),
+    repeats: describeRepeat(e.rrule, e.start, opts.locale ? untilDate(opts.locale) : undefined, opts.locale),
     exdates: e.exdates,
     cancelledDates: e.cancelledDates ?? [],
     movedDates: movedDatesToJson(e, opts.includePrivate),

package/src/lib/calendar/cards.ts

@@ -8,7 +8,7 @@ import { eventStrings } from './event-words';
 import { eventImage } from './images';
 import { eventUrl } from './config';
 import { eventIsPublic, featuredOccurrence, formatOccurrence, locationLine, type Occurrence } from './events';
-import { collectViewEvents } from './data';
+import { collectViewEvents, type ViewEvent } from './data';
 import type { ResolvedEventFilter } from './filter';
 
 export interface EventCardAttrs {
@@ -80,11 +80,11 @@ export async function upcomingEvents(
     displayTz: tz, now, windowStartMs: now, windowEndMs: now + (opts.horizonDays ?? 400) * 86_400_000,
   }, { audience: 'public', calendarIds: opts.calendarIds, includeFeeds: false, filter: opts.filter, locale: opts.locale });
   const seen = new Set<string>();
-  const out: (Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'> & Pick<Partial<Occurrence>, 'moved'>)[] = [];
+  const out: (Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'> & Pick<Partial<Occurrence>, 'moved'> & Pick<ViewEvent, 'rooms'>)[] = [];
   for (const v of events) {
     if (!v.event || v.end <= now || seen.has(v.event.id) || !tagged(v.event.tags)) continue;
     seen.add(v.event.id);
-    out.push({ event: v.event, start: v.start, end: v.end, allDay: v.allDay, days: v.days, cancelled: Boolean(v.cancelled), ...(v.moved ? { moved: v.moved } : {}) });
+    out.push({ event: v.event, start: v.start, end: v.end, allDay: v.allDay, days: v.days, cancelled: Boolean(v.cancelled), ...(v.moved ? { moved: v.moved } : {}), rooms: v.rooms ?? [] });
     if (out.length >= opts.limit) break;
   }
   return out;

package/src/lib/mobile/calendar.ts

@@ -11,6 +11,7 @@ import { sha256Hex } from '../api-keys';
 import type { PublicContext } from './route';
 import { addDaysYmd, describeLink, linkLengths, localMidnight, slotsForDay, ymd } from '../booking/availability';
 import { siteOrigin } from '../seo';
+import { siteLang } from '../dates';
 import { safeUrl } from './content';
 import { pageQuery, isoDay, isoDayOrInstant, queryParams } from './http';
 import { localizeDoc } from '../translations';
@@ -116,7 +117,8 @@ export function occurrenceDto(o: Occurrence, resources: Map<string, Resource>) {
 }
 // e is already localized; publicCalendars limits which calendars are named
 export function publicEventDto(e: CalEvent, origin: string, publicCalendars: Map<string, Calendar>, settings: Settings, locale: string | null, resources?: Map<string, Resource>) {
-  const event = eventToJson(e, origin, publicCalendars, settings.timezone, { resources });
+  // the repeat line in the request's language, else the site's main one
+  const event = eventToJson(e, origin, publicCalendars, settings.timezone, { resources, locale: locale || siteLang(settings) });
   event.url = localizedUrl(event.url, origin, locale);
   // Only configured public event fields; no undeclared imported metadata, no private fields.
   event.fields = publicEventFields(e.fields);

package/src/lib/section-items.ts

@@ -0,0 +1,24 @@
+// The item shapes section data carries (lib/sections.ts fills them): what a
+// theme's section components and the apps' native sections receive.
+// No imports, so other packages can typecheck against them
+// (packages/native keeps its own copy; test/section-items.test.ts there
+// keeps the two in step).
+
+export interface LinkValue { label: string; href: string; external: boolean }
+/** a room this date holds, named only when set to show on public events; color null = none */
+export interface EventItemRoom { slug: string; name: string; color: string | null }
+export interface EventItem {
+  title: string; url: string; summary: string; image: string; imageAlt: string; location: string;
+  start: string; end: string; allDay: boolean; cancelled: boolean;
+  /** this date was moved here: from "Thu, Oct 1 · 6:00 PM" (where it was), with staff's public note; null when not moved */
+  moved: { from: string; note: string } | null;
+  /** the public rooms this date holds (a moved date's own, when it moved into others) */
+  rooms: EventItemRoom[];
+  /** "Sat, Oct 3 · 11:00 AM" */ when: string; /** "Saturday, October 3, 2026" */ date: string;
+  /** "11:00 AM – 1:00 PM EDT" */ time: string; month: string; day: string; weekday: string;
+  cta: { label: string; href: string } | null;
+}
+export interface PostAuthor { name: string; url: string; avatar: string }
+// excerpt: the post's own, else the first ~160 characters of its text
+export interface PostItem { title: string; url: string; excerpt: string; image: string; imageAlt: string; date: string; publishedAt: number | null; tags: string[]; authors: PostAuthor[] }
+export interface BookingItem { title: string; url: string; description: string; resource: string; minutes: number }

package/src/lib/sections.ts

@@ -28,20 +28,8 @@ type Instance = z.infer<typeof SectionInstanceSchema>;
 type Definition = z.infer<typeof SectionDefinition>;
 type FieldDef = Definition['fields'][string];
 
-export interface LinkValue { label: string; href: string; external: boolean }
-export interface EventItem {
-  title: string; url: string; summary: string; image: string; imageAlt: string; location: string;
-  start: string; end: string; allDay: boolean; cancelled: boolean;
-  /** this date was moved here: from "Thu, Oct 1 · 6:00 PM" (where it was), with staff's public note; null when not moved */
-  moved: { from: string; note: string } | null;
-  /** "Sat, Oct 3 · 11:00 AM" */ when: string; /** "Saturday, October 3, 2026" */ date: string;
-  /** "11:00 AM – 1:00 PM EDT" */ time: string; month: string; day: string; weekday: string;
-  cta: { label: string; href: string } | null;
-}
-export interface PostAuthor { name: string; url: string; avatar: string }
-// excerpt: the post's own, else the first ~160 characters of its text
-export interface PostItem { title: string; url: string; excerpt: string; image: string; imageAlt: string; date: string; publishedAt: number | null; tags: string[]; authors: PostAuthor[] }
-export interface BookingItem { title: string; url: string; description: string; resource: string; minutes: number }
+import type { BookingItem, EventItem, LinkValue, PostAuthor, PostItem } from './section-items';
+export type { BookingItem, EventItem, EventItemRoom, LinkValue, PostAuthor, PostItem } from './section-items';
 
 /** apply a theme migration when the stored instance is older than the definition */
 export function migrateSection(theme: Pick<Theme, 'sections' | 'migrations'>, s: Instance): Instance {
@@ -148,7 +136,8 @@ async function resolveSource(field: Extract<FieldDef, { type: 'source' }>, value
       return {
         title: e.title || 'Untitled event', url: lp(eventUrl(e.slug)), summary: e.excerpt, image: safeUrl(e.cover), imageAlt: e.coverAlt,
         location: locationLine(o.moved?.location ?? e.location), start: new Date(o.start).toISOString(), end: new Date(o.end).toISOString(),
-        allDay: o.allDay, cancelled: o.cancelled, moved: was && o.moved ? { from: o.allDay ? was.date : was.range, note: o.moved.note } : null, when: f.range, date: f.date, time: f.time, month: f.month, day: f.day, weekday: f.weekday,
+        allDay: o.allDay, cancelled: o.cancelled, moved: was && o.moved ? { from: o.allDay ? was.date : was.range, note: o.moved.note } : null,
+        rooms: (o.rooms ?? []).map((r) => ({ slug: r.slug, name: r.name, color: r.color || null })), when: f.range, date: f.date, time: f.time, month: f.month, day: f.day, weekday: f.weekday,
         cta: e.cta.label && ctaHref && !o.cancelled ? { label: e.cta.label, href: ctaHref } : null,
       };
     });

package/src/theme-sdk/calendar.ts

@@ -1,5 +1,6 @@
 import { CALENDAR } from '../lib/calendar/config';
 import type { Occurrence } from '../lib/calendar/events';
+import type { ViewEvent } from '../lib/calendar/data';
 
 export { eventUrl } from '../lib/calendar/config';
 
@@ -31,8 +32,9 @@ export interface UpcomingEventsOptions {
  * fields except private custom fields. `cancelled` is true when the whole
  * event or just this date is cancelled. `moved` is set when this date of a
  * series was moved here: `from` (its old start and end) and staff's `note`.
+ * `rooms` are the public rooms this date holds ({ id, slug, name, color }).
  */
-export type UpcomingEvent = Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'> & Pick<Partial<Occurrence>, 'moved'>;
+export type UpcomingEvent = Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'> & Pick<Partial<Occurrence>, 'moved'> & Pick<ViewEvent, 'rooms'>;
 
 /** Server-side helper for Astro templates and endpoints. No repository access needed. */
 export async function upcomingEvents(

package/src/theme-sdk/index.ts

@@ -19,7 +19,7 @@ export interface EventProps { settings: Settings; event: CalEvent; html: string;
  * `acms theme types <slug>` writes a typed Data interface per section.
  */
 export interface SectionProps<D = Record<string, unknown>> { data: D; variant: string; settings: Settings; page: Page }
-export type { LinkValue, EventItem, PostItem, PostAuthor, BookingItem } from '../lib/sections';
+export type { LinkValue, EventItem, EventItemRoom, 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)