ferst-core 0.7.5 → 0.7.6

package/components/recipes/Contacts.astro

@@ -11,7 +11,7 @@ import Icon from '../Icon.astro';
 import { inlineMarkdown, textWithBreaks } from '../../lib/inline-markdown';
 import { mailtoHref, telHref } from '../../lib/links';
 
-interface Contact { role: string; name?: string; phone?: string; email?: string; emailSubject?: string; address?: string; hours?: string }
+interface Contact { role?: string; name?: string; phone?: string; email?: string; emailSubject?: string; address?: string; hours?: string }
 interface Props {
   title?: string;
   intro?: string;
@@ -38,8 +38,8 @@ const { title, intro, groups = [] } = Astro.props;
       <ul class="b-contacts__grid">
         {g.contacts.map((c) => (
           <li class="b-contacts__card">
-            <h3 class="b-contacts__role">{c.role}</h3>
-            {c.name && <p class="b-contacts__name">{c.name}</p>}
+            <h3 class="b-contacts__role">{c.role ?? c.name}</h3>
+            {c.role && c.name && <p class="b-contacts__name">{c.name}</p>}
             <div class="b-contacts__lines">
               {c.phone && <a class="b-contacts__line" href={telHref(c.phone)}><Icon name="phone" size={16} /><span>{c.phone}</span></a>}
               {c.email && <a class="b-contacts__line" href={mailtoHref(c.email, c.emailSubject)}><Icon name="email" size={16} /><span>{c.email}</span></a>}

package/components/recipes/Documents.astro

@@ -8,7 +8,7 @@
 import Heading from '../blocks/Heading.astro';
 import Icon from '../Icon.astro';
 import { documentGroups, type DocumentItem } from '../../lib/documents';
-
+import { inlineMarkdown } from '../../lib/inline-markdown';
 interface Props {
   title?: string;
   intro?: string;
@@ -23,7 +23,7 @@ const groups = documentGroups(items, groupByYear);
   {(title || intro) && (
     <div class="b-docs__head">
       {title && <Heading text={title} level={2} />}
-      {intro && <p class="b-docs__intro">{intro}</p>}
+      {intro && <p class="b-docs__intro" set:html={inlineMarkdown(intro)} />}
     </div>
   )}
   {items.length === 0 ? (

package/components/recipes/Steps.astro

@@ -1,120 +1,121 @@
----
-/** Steps — a Level-2 recipe: a numbered process. `horizontal` lays connected
- *  cards in a row; `vertical` a stacked timeline. Composes Heading + Icon. */
-import Heading from '../blocks/Heading.astro';
-import Icon from '../Icon.astro';
-import { isIconKey } from '../../lib/icons';
-
-interface Item { title: string; text?: string; icon?: string }
-interface Props {
-  title?: string;
-  intro?: string;
-  layout?: 'horizontal' | 'vertical';
-  items?: Item[];
-}
-const { title, intro, layout = 'horizontal', items = [] } = Astro.props;
----
-
-<section class="b-steps" data-layout={layout}>
-  {(title || intro) && (
-    <div class="b-steps__head">
-      {title && <Heading text={title} level={2} align="center" />}
-      {intro && <p class="b-steps__intro">{intro}</p>}
-    </div>
-  )}
-  <ol class="b-steps__list">
-    {items.map((item, i) => (
-      <li class="b-steps__item">
-        <span class="b-steps__marker" aria-hidden="true">
-          {item.icon && isIconKey(item.icon) ? <Icon name={item.icon} size={20} /> : i + 1}
-        </span>
-        <div class="b-steps__body">
-          <h3 class="b-steps__title">{item.title}</h3>
-          {item.text && <p class="b-steps__text">{item.text}</p>}
-        </div>
-      </li>
-    ))}
-  </ol>
-</section>
-
-<style>
-  .b-steps {
-    display: flex;
-    flex-direction: column;
-    gap: 2rem;
-    max-width: 72rem;
-    margin-inline: auto;
-    padding-inline: 1rem;
-  }
-  .b-steps__head {
-    max-width: var(--max);
-    margin-inline: auto;
-    text-align: center;
-    display: flex;
-    flex-direction: column;
-    gap: 0.75rem;
-  }
-  .b-steps__intro { margin: 0; color: var(--muted); line-height: 1.6; }
-  .b-steps__list {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    display: grid;
-    gap: 1.5rem;
-  }
-  /* Base (and mobile): marker left, body right. */
-  .b-steps__item {
-    display: flex;
-    gap: 1rem;
-    align-items: flex-start;
-  }
-  .b-steps__marker {
-    flex-shrink: 0;
-    width: 2.5rem;
-    height: 2.5rem;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: var(--radius-pill);
-    background: var(--gold);
-    color: var(--text-light);
-    font-family: var(--font-heading);
-    font-weight: 700;
-    font-size: 1.05rem;
-  }
-  .b-steps__title { margin: 0 0 0.35rem; font-size: 1.1rem; color: var(--fg); }
-  .b-steps__text { margin: 0; color: var(--muted); line-height: 1.6; }
-
-  /* Vertical: a centred, stacked timeline. */
-  .b-steps[data-layout='vertical'] .b-steps__list { max-width: 40rem; margin-inline: auto; }
-
-  /* Horizontal (≥48em): connected cards in a row, marker over centred body. */
-  @media (min-width: 48em) {
-    .b-steps[data-layout='horizontal'] .b-steps__list {
-      grid-auto-flow: column;
-      grid-auto-columns: 1fr;
-      gap: 1rem;
-    }
-    .b-steps[data-layout='horizontal'] .b-steps__item {
-      flex-direction: column;
-      align-items: center;
-      text-align: center;
-      gap: 0.85rem;
-      position: relative;
-    }
-    /* Connector from this marker's right edge to the next marker's left edge.
-       The +1.5rem / -2rem account for the 2.5rem marker AND the 1rem grid gap,
-       so the line sits centred between markers (not falling short). */
-    .b-steps[data-layout='horizontal'] .b-steps__item:not(:last-child)::after {
-      content: '';
-      position: absolute;
-      top: calc(1.25rem - 1px);
-      left: calc(50% + 1.5rem);
-      width: calc(100% - 2rem);
-      height: 2px;
-      background: var(--border);
-      z-index: 0;
-    }
-    .b-steps[data-layout='horizontal'] .b-steps__marker { position: relative; z-index: 1; }
-  }
-</style>
+---
+/** Steps — a Level-2 recipe: a numbered process. `horizontal` lays connected
+ *  cards in a row; `vertical` a stacked timeline. Composes Heading + Icon. */
+import Heading from '../blocks/Heading.astro';
+import Icon from '../Icon.astro';
+import { isIconKey } from '../../lib/icons';
+
+import { inlineMarkdown } from '../../lib/inline-markdown';
+interface Item { title: string; text?: string; icon?: string }
+interface Props {
+  title?: string;
+  intro?: string;
+  layout?: 'horizontal' | 'vertical';
+  items?: Item[];
+}
+const { title, intro, layout = 'horizontal', items = [] } = Astro.props;
+---
+
+<section class="b-steps" data-layout={layout}>
+  {(title || intro) && (
+    <div class="b-steps__head">
+      {title && <Heading text={title} level={2} align="center" />}
+      {intro && <p class="b-steps__intro" set:html={inlineMarkdown(intro)} />}
+    </div>
+  )}
+  <ol class="b-steps__list">
+    {items.map((item, i) => (
+      <li class="b-steps__item">
+        <span class="b-steps__marker" aria-hidden="true">
+          {item.icon && isIconKey(item.icon) ? <Icon name={item.icon} size={20} /> : i + 1}
+        </span>
+        <div class="b-steps__body">
+          <h3 class="b-steps__title">{item.title}</h3>
+          {item.text && <p class="b-steps__text">{item.text}</p>}
+        </div>
+      </li>
+    ))}
+  </ol>
+</section>
+
+<style>
+  .b-steps {
+    display: flex;
+    flex-direction: column;
+    gap: 2rem;
+    max-width: 72rem;
+    margin-inline: auto;
+    padding-inline: 1rem;
+  }
+  .b-steps__head {
+    max-width: var(--max);
+    margin-inline: auto;
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+  }
+  .b-steps__intro { margin: 0; color: var(--muted); line-height: 1.6; }
+  .b-steps__list {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    display: grid;
+    gap: 1.5rem;
+  }
+  /* Base (and mobile): marker left, body right. */
+  .b-steps__item {
+    display: flex;
+    gap: 1rem;
+    align-items: flex-start;
+  }
+  .b-steps__marker {
+    flex-shrink: 0;
+    width: 2.5rem;
+    height: 2.5rem;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: var(--radius-pill);
+    background: var(--gold);
+    color: var(--text-light);
+    font-family: var(--font-heading);
+    font-weight: 700;
+    font-size: 1.05rem;
+  }
+  .b-steps__title { margin: 0 0 0.35rem; font-size: 1.1rem; color: var(--fg); }
+  .b-steps__text { margin: 0; color: var(--muted); line-height: 1.6; }
+
+  /* Vertical: a centred, stacked timeline. */
+  .b-steps[data-layout='vertical'] .b-steps__list { max-width: 40rem; margin-inline: auto; }
+
+  /* Horizontal (≥48em): connected cards in a row, marker over centred body. */
+  @media (min-width: 48em) {
+    .b-steps[data-layout='horizontal'] .b-steps__list {
+      grid-auto-flow: column;
+      grid-auto-columns: 1fr;
+      gap: 1rem;
+    }
+    .b-steps[data-layout='horizontal'] .b-steps__item {
+      flex-direction: column;
+      align-items: center;
+      text-align: center;
+      gap: 0.85rem;
+      position: relative;
+    }
+    /* Connector from this marker's right edge to the next marker's left edge.
+       The +1.5rem / -2rem account for the 2.5rem marker AND the 1rem grid gap,
+       so the line sits centred between markers (not falling short). */
+    .b-steps[data-layout='horizontal'] .b-steps__item:not(:last-child)::after {
+      content: '';
+      position: absolute;
+      top: calc(1.25rem - 1px);
+      left: calc(50% + 1.5rem);
+      width: calc(100% - 2rem);
+      height: 2px;
+      background: var(--border);
+      z-index: 0;
+    }
+    .b-steps[data-layout='horizontal'] .b-steps__marker { position: relative; z-index: 1; }
+  }
+</style>

package/components/recipes/Table.astro

@@ -9,6 +9,7 @@ import Heading from '../blocks/Heading.astro';
 
 import { inlineMarkdown } from '../../lib/inline-markdown';
 import { filledColumns } from '../../lib/table';
+import { proseParts } from '../../lib/prose';
 interface Props {
   title?: string;
   intro?: string;
@@ -24,7 +25,7 @@ const keep = filledColumns(columns, rows);
   {(title || intro) && (
     <div class="b-table__head">
       {title && <Heading text={title} level={2} />}
-      {intro && <p class="b-table__intro" set:html={inlineMarkdown(intro)} />}
+      {intro && proseParts(intro).map((part) => part.kind === 'p' ? <p class="b-table__intro" set:html={part.html} /> : <ul class="b-table__intro">{part.items.map((x) => <li set:html={x} />)}</ul>)}
     </div>
   )}
   <div class="b-table__scroll">

package/components/recipes/Video.astro

@@ -38,7 +38,7 @@ const safeLink = /^https:\/\//i.test(url) ? url : undefined;
         </div>
         <div class="b-video__frame"></div>
       </div>
-      {caption && <figcaption class="b-video__caption">{caption}</figcaption>}
+      {caption && <figcaption class="b-video__caption" set:html={inlineMarkdown(caption)} />}
     </figure>
     {/* Always visible, before AND after the player loads: the way to the provider. */}
     <div class="b-video__footer">

package/content/blocks.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { iconKeys, isIconKey } from '../lib/icons';
 
 /**
  * The block palette — the heart of the Ferst page model (see
@@ -14,6 +15,12 @@ import { z } from 'zod';
 
 /** Every block shares a `type` discriminant and an `enabled` flag (keep a block
  *  in the page data without rendering it). */
+/** An icon name from the engine's registry (lib/icons). An unknown name fails validation,
+ *  and so the build, with the valid names listed, instead of rendering nothing silently. */
+const iconName = z.string().refine(isIconKey, (v) => ({
+  message: `Unknown icon "${v}". Use one of: ${iconKeys.join(', ')}.`,
+}));
+
 export const headingBlock = z.object({
   type: z.literal('heading'),
   enabled: z.boolean().default(true),
@@ -159,7 +166,7 @@ export const featureCardsBlock = z.object({
   cards: z
     .array(
       z.object({
-        icon: z.string().optional(),
+        icon: iconName.optional(),
         title: z.string(),
         text: z.string().optional(),
         href: z.string().optional(),
@@ -261,7 +268,7 @@ export const tilesBlock = z.object({
     .array(
       z
         .object({
-          icon: z.string().optional(),
+          icon: iconName.optional(),
           eyebrow: z.string().optional(),
           /** Optional only for a picture tile: with an image and no text, the tile is
            *  the picture alone (no scrim) — a linked poster/logo — named by its alt. */
@@ -319,7 +326,7 @@ export const stepsBlock = z.object({
   title: z.string().optional(),
   intro: z.string().optional(),
   layout: z.enum(['horizontal', 'vertical']).default('horizontal'),
-  items: z.array(z.object({ title: z.string(), text: z.string().optional(), icon: z.string().optional() })).default([]),
+  items: z.array(z.object({ title: z.string(), text: z.string().optional(), icon: iconName.optional() })).default([]),
 });
 
 /** Pricing — a row of plan cards (name, price, period, feature list, CTA). One
@@ -388,7 +395,7 @@ export const bentoBlock = z.object({
       z.object({
         size: z.enum(['sm', 'wide', 'tall', 'lg']).default('sm'),
         variant: z.enum(['surface', 'filled', 'gradient', 'image']).default('surface'),
-        icon: z.string().optional(),
+        icon: iconName.optional(),
         eyebrow: z.string().optional(),
         title: z.string(),
         text: z.string().optional(),
@@ -471,7 +478,7 @@ export const noticeBlock = z.object({
   type: z.literal('notice'),
   enabled: z.boolean().default(true),
   tone: z.enum(['accent', 'neutral']).default('accent'),
-  icon: z.string().optional(),
+  icon: iconName.optional(),
   title: z.string().optional(),
   text: z.string(),
   link: z.object({ label: z.string(), href: z.string() }).optional(),
@@ -492,7 +499,7 @@ export const mediaCardsBlock = z.object({
     .array(
       z.object({
         image: z.object({ src: z.string(), alt: z.string().default('') }).optional(),
-        icon: z.string().optional(),
+        icon: iconName.optional(),
         title: z.string(),
         /** A short meta line shown as a pill (e.g. "Sundays 10:45 · Main hall"). */
         meta: z.string().optional(),
@@ -517,7 +524,7 @@ export const contactCardBlock = z.object({
   items: z
     .array(
       z.object({
-        icon: z.string().optional(),
+        icon: iconName.optional(),
         value: z.string(),
         href: z.string().optional(),
       })
@@ -647,7 +654,7 @@ export const contactsBlock = z.object({
         contacts: z
           .array(
             z.object({
-              role: z.string(),
+              role: z.string().optional(),
               name: z.string().optional(),
               phone: z.string().optional(),
               email: z.string().optional(),
@@ -655,6 +662,7 @@ export const contactsBlock = z.object({
               address: z.string().optional(),
               hours: z.string().optional(),
             })
+            .refine((c) => !!c.role || !!c.name, { message: 'A contact needs a role or a name', path: ['role'] })
           )
           .min(1),
       })

package/content/schemas.ts

@@ -90,6 +90,11 @@ export const navbarSettingsSchema = z.object({
 export const footerSettingsSchema = z.object({
   /** Footer legal/info nav. Empty by default — every client defines its own. */
   footer: z.array(navLinkSchema).default([]),
+  /** Headed footer columns for reference material (policies, safeguarding, documents,
+   *  forms) — where it belongs, so the main menu stays short and clear. */
+  groups: z
+    .array(z.object({ heading: z.string(), links: z.array(navLinkSchema).min(1) }))
+    .default([]),
 });
 
 /**