ferst-core 0.7.6 → 0.7.7

package/bin/ferst-modules.mjs

@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+// ferst-modules — what this site has from its organisation's modules in the Ferst portal:
+// the forms it can place and the calendar it shows. Run it in a client repo root:
+//
+//   npx --no-install ferst-modules                 # the site named in ferst-site.json
+//   npx --no-install ferst-modules --site <address> # or ask by the site's address
+//   npx --no-install ferst-modules --json          # the raw answer
+//
+// Forms and calendars live in the portal, never in the repo: place a form with a
+// `{ "type": "form", "form": "<id>" }` block, and show the calendar by setting
+// calendarSettings.embedUrl to the address printed here.
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { isDirectInvocation, resolveGitBase } from './cms-config.mjs';
+
+/** The site to ask about: `--site <ref>`, else ferst-site.json's siteId, else null. */
+export function moduleRef(argv, siteMeta) {
+  const i = argv.indexOf('--site');
+  if (i !== -1 && argv[i + 1]) return argv[i + 1];
+  return siteMeta && typeof siteMeta.siteId === 'string' && siteMeta.siteId ? siteMeta.siteId : null;
+}
+
+/** A readable summary of GET /sites/:ref/modules. Pure — unit-tested. */
+export function formatModules(data) {
+  const out = [];
+  out.push(`Site: ${data.site.address ?? data.site.id} (${data.site.id})`, '');
+
+  out.push('Forms');
+  if (!data.modules.forms) out.push('  The Forms module is off for this site.');
+  else if (data.forms.length === 0) out.push('  No forms yet. They are created in the portal (Forms).');
+  for (const f of data.forms) {
+    out.push(`  ${f.name}`);
+    out.push(`    place it with: { "type": "form", "form": "${f.id}" }`);
+    out.push(`    fields: ${f.fields.map((x) => `${x.label}${x.required ? ' *' : ''}`).join(', ') || '(none)'}`);
+    out.push(`    button: ${f.submitLabel}`);
+  }
+  out.push('');
+
+  out.push('Events');
+  if (!data.events) out.push('  The Events module is off for this site.');
+  else {
+    out.push(`  calendarSettings.embedUrl = ${data.events.embedUrl}`);
+    out.push(
+      data.events.calendars.length
+        ? `  shows: ${data.events.calendars.map((c) => c.name).join(', ')}`
+        : '  No calendars chosen yet. They are connected in the portal (Events).',
+    );
+  }
+  return out.join('\n');
+}
+
+function readSiteMeta(cwd) {
+  try {
+    return JSON.parse(readFileSync(resolve(cwd, 'ferst-site.json'), 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+async function main() {
+  const argv = process.argv.slice(2);
+  const ref = moduleRef(argv, readSiteMeta(process.cwd()));
+  if (!ref) {
+    console.error('ferst-modules: no site to ask about. Pass --site <your site address> (e.g. --site example.pages.dev), or add "siteId" to ferst-site.json.');
+    process.exit(2);
+  }
+  const base = resolveGitBase();
+  const url = `${base}/sites/${encodeURIComponent(ref)}/modules`;
+  let res;
+  try {
+    res = await fetch(url, { headers: { Accept: 'application/json' } });
+  } catch (e) {
+    console.error(`ferst-modules: couldn't reach the Ferst platform at ${url}: ${e instanceof Error ? e.message : e}`);
+    process.exit(1);
+  }
+  if (res.status === 404) {
+    console.error(`ferst-modules: the platform doesn't know a site "${ref}". Check the address, or ask the core team (a core-request issue).`);
+    process.exit(1);
+  }
+  if (!res.ok) {
+    console.error(`ferst-modules: the platform answered ${res.status} for ${url}.`);
+    process.exit(1);
+  }
+  const data = await res.json();
+  console.log(argv.includes('--json') ? JSON.stringify(data, null, 2) : formatModules(data));
+}
+
+// Run when invoked directly as a bin — including via npm's node_modules/.bin symlink.
+if (isDirectInvocation(process.argv[1])) {
+  main();
+}

package/components/BlockRenderer.astro

@@ -26,6 +26,7 @@ import Faq from './recipes/Faq.astro';
 import Gallery from './recipes/Gallery.astro';
 import Testimonial from './recipes/Testimonial.astro';
 import ContactForm from './recipes/ContactForm.astro';
+import Form from './recipes/Form.astro';
 import Accordion from './recipes/Accordion.astro';
 import Tiles from './recipes/Tiles.astro';
 import Banner from './recipes/Banner.astro';
@@ -79,6 +80,7 @@ const registry: Record<BlockType, any> = {
   gallery: Gallery,
   testimonial: Testimonial,
   contactForm: ContactForm,
+  form: Form,
   accordion: Accordion,
   tiles: Tiles,
   banner: Banner,

package/components/ProseParts.astro

@@ -0,0 +1,26 @@
+---
+/**
+ * ProseParts — renders prose text as paragraphs and lists (lib/prose: blank lines →
+ * paragraphs, `- ` / `1. ` lines → lists, inline links / bold / italic, all escaped).
+ * The one place this markup lives, shared by prose, document, accordion, mediaText and
+ * table intros, so a fix lands everywhere at once.
+ *
+ * Note for callers: these elements carry THIS component's style scope, so a parent styles
+ * them through its own wrapper with `:global(p)`, `:global(ul)` etc.
+ */
+import { proseParts } from '../lib/prose';
+
+interface Props {
+  text: string | undefined | null;
+  /** Optional class on each paragraph / list (e.g. a table intro's). */
+  class?: string;
+}
+const { text, class: cls } = Astro.props;
+const parts = proseParts(text);
+---
+
+{parts.map((part) =>
+  part.kind === 'p' ? <p class={cls} set:html={part.html} />
+  : part.kind === 'ul' ? <ul class={cls}>{part.items.map((x) => <li set:html={x} />)}</ul>
+  : <ol class={cls}>{part.items.map((x) => <li set:html={x} />)}</ol>
+)}

package/components/blocks/Prose.astro

@@ -1,5 +1,5 @@
 ---
-import { proseParts } from '../../lib/prose';
+import ProseParts from '../ProseParts.astro';
 interface Props {
   text: string;
   variant?: 'body' | 'lead';
@@ -7,40 +7,35 @@ interface Props {
 const { text, variant = 'body' } = Astro.props;
 // Blank lines separate paragraphs; `- ` / `1. ` lines make lists; links, bold and
 // italic are rendered safely (lib/prose.ts → inlineMarkdown).
-const parts = proseParts(text);
 ---
 
 <div class="b-prose" data-variant={variant === 'lead' ? 'lead' : undefined}>
-  {parts.map((part) =>
-    part.kind === 'p' ? <p set:html={part.html} />
-    : part.kind === 'ul' ? <ul>{part.items.map((i) => <li set:html={i} />)}</ul>
-    : <ol>{part.items.map((i) => <li set:html={i} />)}</ol>
-  )}
+  <ProseParts text={text} />
 </div>
 
 <style>
   .b-prose {
     color: var(--fg);
   }
-  .b-prose p,
-  .b-prose ul,
-  .b-prose ol {
+  .b-prose :global(p),
+  .b-prose :global(ul),
+  .b-prose :global(ol) {
     margin: 0 0 1rem;
     line-height: 1.7;
     max-width: var(--max);
   }
-  .b-prose ul,
-  .b-prose ol {
+  .b-prose :global(ul),
+  .b-prose :global(ol) {
     padding-inline-start: 1.4em;
   }
-  .b-prose li + li {
+  .b-prose :global(li + li) {
     margin-top: 0.25rem;
   }
-  .b-prose > :last-child {
+  .b-prose > :global(:last-child) {
     margin-bottom: 0;
   }
   /* The page's introduction: larger, quieter, a narrower measure. */
-  .b-prose[data-variant='lead'] p {
+  .b-prose[data-variant='lead'] :global(p) {
     font-size: clamp(1.125rem, 1.6vw, 1.3125rem);
     line-height: 1.6;
     color: var(--muted);
@@ -55,10 +50,10 @@ const parts = proseParts(text);
      section is centred (or end-aligned) re-anchor it so the text reads as
      deliberately centred, not centred inside a left column. Text-align itself
      is inherited from the content-align cascade. */
-  :global([data-content-align='center']) .b-prose > * {
+  :global([data-content-align='center']) .b-prose > :global(*) {
     margin-inline: auto;
   }
-  :global([data-content-align='end']) .b-prose > * {
+  :global([data-content-align='end']) .b-prose > :global(*) {
     margin-inline-start: auto;
   }
 </style>

package/components/recipes/Accordion.astro

@@ -4,7 +4,7 @@
  *  Native <details>/<summary> — accessible, interactive, zero JavaScript. */
 import Heading from '../blocks/Heading.astro';
 
-import { proseParts } from '../../lib/prose';
+import ProseParts from '../ProseParts.astro';
 interface Props {
   title?: string;
   items?: { heading: string; body: string }[];
@@ -19,11 +19,7 @@ const { title, items = [] } = Astro.props;
       <details class="b-accordion__item">
         <summary class="b-accordion__head">{item.heading}</summary>
         <div class="b-accordion__body">
-          {proseParts(item.body).map((part) =>
-            part.kind === 'p' ? <p set:html={part.html} />
-            : part.kind === 'ul' ? <ul>{part.items.map((x) => <li set:html={x} />)}</ul>
-            : <ol>{part.items.map((x) => <li set:html={x} />)}</ol>
-          )}
+          <ProseParts text={item.body} />
         </div>
       </details>
     ))}
@@ -85,7 +81,7 @@ const { title, items = [] } = Astro.props;
     color: var(--muted);
     line-height: 1.6;
   }
-  .b-accordion__body p {
+  .b-accordion__body :global(p) {
     margin: 0;
   }
 </style>

package/components/recipes/Document.astro

@@ -6,7 +6,7 @@
  * (links, bold, lists); `items` add a list. Print-friendly: the contents list is
  * dropped on paper.
  */
-import { proseParts } from '../../lib/prose';
+import ProseParts from '../ProseParts.astro';
 import { inlineMarkdown } from '../../lib/inline-markdown';
 import { longDate } from '../../lib/documents';
 import { pageSlugs, uniqueSlug } from '../../lib/slug';
@@ -44,11 +44,7 @@ const ids = sections.map((s) => uniqueSlug(s.title, used));
     {sections.map((s, i) => (
       <section class="b-doc__clause" id={ids[i]}>
         <h2 id={`clause-${i + 1}`}>{numbered && <span class="b-doc__num">{i + 1}.</span>} {s.title}</h2>
-        {proseParts(s.body).map((part) =>
-          part.kind === 'p' ? <p set:html={part.html} />
-          : part.kind === 'ul' ? <ul>{part.items.map((x) => <li set:html={x} />)}</ul>
-          : <ol>{part.items.map((x) => <li set:html={x} />)}</ol>
-        )}
+        <ProseParts text={s.body} />
         {s.items && s.items.length > 0 && <ul>{s.items.map((x) => <li set:html={inlineMarkdown(x)} />)}</ul>}
       </section>
     ))}
@@ -135,14 +131,14 @@ const ids = sections.map((s) => uniqueSlug(s.title, used));
     color: var(--gold);
     font-variant-numeric: tabular-nums;
   }
-  .b-doc__clause p,
-  .b-doc__clause ul,
-  .b-doc__clause ol {
+  .b-doc__clause :global(p),
+  .b-doc__clause :global(ul),
+  .b-doc__clause :global(ol) {
     margin: 0 0 0.75rem;
     line-height: 1.7;
   }
-  .b-doc__clause ul,
-  .b-doc__clause ol {
+  .b-doc__clause :global(ul),
+  .b-doc__clause :global(ol) {
     padding-inline-start: 1.4em;
   }
   .b-doc__clause :global(a) {

package/components/recipes/Form.astro

@@ -0,0 +1,30 @@
+---
+/**
+ * Form — one of the organisation's forms from the Ferst portal, placed by id. Reads the
+ * form's fields, button and submit address from the platform at build time (lib/forms)
+ * and renders it with the ContactForm recipe, so it looks like every other form and a
+ * change made in the portal reaches the site on its next build.
+ */
+import ContactForm from './ContactForm.astro';
+import { loadFormDefinition } from '../../lib/forms';
+import { resolveGitBase } from '../../bin/cms-config.mjs';
+
+interface Props {
+  form: string;
+  title?: string;
+  intro?: string;
+  note?: string;
+}
+const { form, title, intro, note } = Astro.props;
+const def = await loadFormDefinition(form, { base: resolveGitBase() });
+---
+
+<ContactForm
+  title={title ?? def.name}
+  intro={intro}
+  action={def.action}
+  method="post"
+  submitLabel={def.submitLabel}
+  note={note}
+  fields={def.fields}
+/>

package/components/recipes/MediaText.astro

@@ -1,92 +1,88 @@
----
-/**
- * MediaText — an image beside its text, on the start or end side; stacks (text, then image)
- * on a phone. The text takes prose formatting (paragraphs, lists, links); the image keeps
- * its own shape unless `ratio` sets one (cropped to fill). An optional button follows the
- * text.
- */
-import Heading from '../blocks/Heading.astro';
-import Button from '../Button.astro';
-import { proseParts } from '../../lib/prose';
-
-interface Props {
-  title?: string;
-  text: string;
-  image: { src: string; alt?: string; caption?: string };
-  imageSide?: 'start' | 'end';
-  ratio?: 'auto' | '1/1' | '4/3' | '3/2' | '16/9';
-  cta?: { label: string; href: string };
-}
-const { title, text, image, imageSide = 'end', ratio = 'auto', cta } = Astro.props;
----
-
-<section class="b-mediatext" data-side={imageSide}>
-  <div class="b-mediatext__text">
-    {title && <Heading text={title} level={2} />}
-    {proseParts(text).map((part) =>
-      part.kind === 'p' ? <p set:html={part.html} />
-      : part.kind === 'ul' ? <ul>{part.items.map((x) => <li set:html={x} />)}</ul>
-      : <ol>{part.items.map((x) => <li set:html={x} />)}</ol>
-    )}
-    {cta && <div class="b-mediatext__cta"><Button href={cta.href} variant="primary">{cta.label}</Button></div>}
-  </div>
-  <figure class="b-mediatext__media">
-    <img src={image.src} alt={image.alt ?? ''} loading="lazy" decoding="async" style={ratio !== 'auto' ? `aspect-ratio: ${ratio}; object-fit: cover` : undefined} />
-    {image.caption && <figcaption>{image.caption}</figcaption>}
-  </figure>
-</section>
-
-<style>
-  .b-mediatext {
-    display: grid;
-    gap: clamp(1.5rem, 4vw, 3rem);
-    align-items: center;
-    width: 100%;
-    max-width: 72rem;
-  }
-  @media (min-width: 48em) {
-    .b-mediatext {
-      grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
-    }
-    .b-mediatext[data-side='start'] .b-mediatext__media {
-      order: -1;
-    }
-  }
-  .b-mediatext__text {
-    display: flex;
-    flex-direction: column;
-    gap: 0.9rem;
-  }
-  .b-mediatext__text p,
-  .b-mediatext__text ul,
-  .b-mediatext__text ol {
-    margin: 0;
-    line-height: 1.7;
-  }
-  .b-mediatext__text ul,
-  .b-mediatext__text ol {
-    padding-inline-start: 1.4em;
-  }
-  .b-mediatext__text :global(a:not(.btn)) {
-    color: var(--accent);
-    text-decoration: underline;
-    text-underline-offset: 0.15em;
-  }
-  .b-mediatext__cta {
-    margin-top: 0.4rem;
-  }
-  .b-mediatext__media {
-    margin: 0;
-  }
-  .b-mediatext__media img {
-    display: block;
-    width: 100%;
-    height: auto;
-    border-radius: var(--radius);
-  }
-  .b-mediatext__media figcaption {
-    margin-top: 0.5rem;
-    font-size: 0.875rem;
-    color: var(--muted);
-  }
-</style>
+---
+/**
+ * MediaText — an image beside its text, on the start or end side; stacks (text, then image)
+ * on a phone. The text takes prose formatting (paragraphs, lists, links); the image keeps
+ * its own shape unless `ratio` sets one (cropped to fill). An optional button follows the
+ * text.
+ */
+import Heading from '../blocks/Heading.astro';
+import Button from '../Button.astro';
+import ProseParts from '../ProseParts.astro';
+
+interface Props {
+  title?: string;
+  text: string;
+  image: { src: string; alt?: string; caption?: string };
+  imageSide?: 'start' | 'end';
+  ratio?: 'auto' | '1/1' | '4/3' | '3/2' | '16/9';
+  cta?: { label: string; href: string };
+}
+const { title, text, image, imageSide = 'end', ratio = 'auto', cta } = Astro.props;
+---
+
+<section class="b-mediatext" data-side={imageSide}>
+  <div class="b-mediatext__text">
+    {title && <Heading text={title} level={2} />}
+    <ProseParts text={text} />
+    {cta && <div class="b-mediatext__cta"><Button href={cta.href} variant="primary">{cta.label}</Button></div>}
+  </div>
+  <figure class="b-mediatext__media">
+    <img src={image.src} alt={image.alt ?? ''} loading="lazy" decoding="async" style={ratio !== 'auto' ? `aspect-ratio: ${ratio}; object-fit: cover` : undefined} />
+    {image.caption && <figcaption>{image.caption}</figcaption>}
+  </figure>
+</section>
+
+<style>
+  .b-mediatext {
+    display: grid;
+    gap: clamp(1.5rem, 4vw, 3rem);
+    align-items: center;
+    width: 100%;
+    max-width: 72rem;
+  }
+  @media (min-width: 48em) {
+    .b-mediatext {
+      grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+    }
+    .b-mediatext[data-side='start'] .b-mediatext__media {
+      order: -1;
+    }
+  }
+  .b-mediatext__text {
+    display: flex;
+    flex-direction: column;
+    gap: 0.9rem;
+  }
+  .b-mediatext__text :global(p),
+  .b-mediatext__text :global(ul),
+  .b-mediatext__text :global(ol) {
+    margin: 0;
+    line-height: 1.7;
+  }
+  .b-mediatext__text :global(ul),
+  .b-mediatext__text :global(ol) {
+    padding-inline-start: 1.4em;
+  }
+  .b-mediatext__text :global(a:not(.btn)) {
+    color: var(--accent);
+    text-decoration: underline;
+    text-underline-offset: 0.15em;
+  }
+  .b-mediatext__cta {
+    margin-top: 0.4rem;
+  }
+  .b-mediatext__media {
+    margin: 0;
+  }
+  .b-mediatext__media img {
+    display: block;
+    width: 100%;
+    height: auto;
+    border-radius: var(--radius);
+  }
+  .b-mediatext__media figcaption {
+    margin-top: 0.5rem;
+    font-size: 0.875rem;
+    color: var(--muted);
+  }
+</style>

package/components/recipes/Table.astro

@@ -9,7 +9,7 @@ import Heading from '../blocks/Heading.astro';
 
 import { inlineMarkdown } from '../../lib/inline-markdown';
 import { filledColumns } from '../../lib/table';
-import { proseParts } from '../../lib/prose';
+import ProseParts from '../ProseParts.astro';
 interface Props {
   title?: string;
   intro?: string;
@@ -25,7 +25,7 @@ const keep = filledColumns(columns, rows);
   {(title || intro) && (
     <div class="b-table__head">
       {title && <Heading text={title} level={2} />}
-      {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>)}
+      {intro && <ProseParts text={intro} class="b-table__intro" />}
     </div>
   )}
   <div class="b-table__scroll">
@@ -58,7 +58,7 @@ const keep = filledColumns(columns, rows);
     flex-direction: column;
     gap: 0.6rem;
   }
-  .b-table__intro {
+  :global(.b-table__intro) {
     margin: 0;
     color: var(--muted);
     max-width: var(--max);