ferst-core 0.7.5 → 0.7.7

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([]),
 });
 
 /**

package/fonts/OFL.txt

@@ -0,0 +1,287 @@
+Fonts in this folder are distributed under the SIL Open Font License, Version 1.1.
+Files taken unmodified from Fontsource (https://fontsource.org): @fontsource/inter, @fontsource/playfair-display and @fontsource/poppins 5.3.0.
+
+==================== inter ====================
+Copyright 2016 The Inter Project Authors (https://github.com/rsms/inter) Inter-Italic[opsz,wght].ttf: Copyright 2016 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+==================== playfair-display ====================
+Copyright 2017 The Playfair Display Project Authors (https://github.com/clauseggers/Playfair-Display), with Reserved Font Name "Playfair Display". PlayfairDisplay-Italic[wght].ttf: Copyright 2017 The Playfair Display Project Authors (https://github.com/clauseggers/Playfair-Display), with Reserved Font Name "Playfair Display".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+==================== poppins ====================
+Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-ThinItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-ExtraLight.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-ExtraLightItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-Light.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-LightItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-Regular.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-Italic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-Medium.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-MediumItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-SemiBold.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-SemiBoldItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-Bold.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-BoldItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-ExtraBold.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-ExtraBoldItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-Black.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) Poppins-BlackItalic.ttf: Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

package/integration.mjs

@@ -27,7 +27,45 @@
  *   the site has its own `src/pages/cookie-policy.astro`.
  * @returns {import('astro').AstroIntegration}
  */
-import { existsSync } from 'node:fs';
+import { copyFileSync, createReadStream, existsSync, mkdirSync, readdirSync } from 'node:fs';
+
+/** The self-hosted fonts the engine's CSS requests (/fonts/*.woff2), shipped in the package. */
+const FONTS_DIR = new URL('./fonts/', import.meta.url);
+const FONT_URL = /^\/fonts\/([a-z0-9-]+\.woff2)(?:\?.*)?$/;
+
+/**
+ * ferstFonts() — serves the engine's self-hosted fonts in `astro dev` and copies them into
+ * every build's `/fonts/`. Included in ferst(); usable on its own (the showcase). A file
+ * the site already has in its own `public/fonts/` is never overwritten.
+ * @returns {import('astro').AstroIntegration}
+ */
+export function ferstFonts() {
+  return {
+    name: 'ferst-fonts',
+    hooks: {
+      'astro:server:setup': ({ server }) => {
+        server.middlewares.use((req, res, next) => {
+          const m = req.url && req.url.match(FONT_URL);
+          if (!m) return next();
+          const file = new URL(m[1], FONTS_DIR);
+          if (!existsSync(file)) return next();
+          res.setHeader('Content-Type', 'font/woff2');
+          res.setHeader('Cache-Control', 'public, max-age=31536000, immutable');
+          createReadStream(file).pipe(res);
+        });
+      },
+      'astro:build:done': async ({ dir }) => {
+        const out = new URL('fonts/', dir);
+        mkdirSync(out, { recursive: true });
+        for (const name of readdirSync(FONTS_DIR)) {
+          if (!name.endsWith('.woff2')) continue;
+          const dest = new URL(name, out);
+          if (!existsSync(dest)) copyFileSync(new URL(name, FONTS_DIR), dest);
+        }
+      },
+    },
+  };
+}
 
 export default function ferst(options = {}) {
   const { calendar = true, blog = true, cookiePolicy = true } = options;
@@ -78,6 +116,8 @@ export default function ferst(options = {}) {
           });
         }
       },
+      // The engine's self-hosted fonts: served in dev, copied into every build.
+      ...ferstFonts().hooks,
     },
   };
 }

package/layouts/Base.astro

@@ -215,6 +215,7 @@ const metaDescription = description ?? identity.description;
     <SiteFooter
       facebookUrl={contact.facebookUrl}
       footerLinks={navigation.footer}
+      groups={navigation.footerGroups}
       cta={navigation.cta}
       footerClass={footerClass}
       shortName={identity.shortName}

package/lib/forms.ts

@@ -0,0 +1,57 @@
+/**
+ * A form placed by id (the `form` block) is read from the Ferst platform at build time, so
+ * a change made to it in the portal reaches the site on its next build — no pasted copy of
+ * its fields to keep in step. A missing form or an unreachable platform fails the build:
+ * better the last good deploy stays live than a form that can't be sent goes out.
+ */
+export interface FormField {
+  name: string;
+  label: string;
+  type?: 'text' | 'email' | 'tel' | 'textarea';
+  required?: boolean;
+  placeholder?: string;
+}
+
+export interface FormDefinition {
+  name: string;
+  submitLabel: string;
+  fields: FormField[];
+  /** Where the browser posts the form. */
+  action: string;
+}
+
+type FetchFn = (input: string, init?: RequestInit) => Promise<Response>;
+
+const cache = new Map<string, Promise<FormDefinition>>();
+
+export function loadFormDefinition(id: string, opts: { base: string; fetch?: FetchFn }): Promise<FormDefinition> {
+  const key = `${opts.base}|${id}`;
+  let hit = cache.get(key);
+  if (!hit) {
+    hit = fetchDefinition(id, opts.base, opts.fetch ?? fetch);
+    cache.set(key, hit);
+    hit.catch(() => cache.delete(key)); // a failure is retried by the next caller
+  }
+  return hit;
+}
+
+async function fetchDefinition(id: string, base: string, fetchFn: FetchFn): Promise<FormDefinition> {
+  const url = `${base}/forms/${encodeURIComponent(id)}`;
+  let res: Response;
+  try {
+    res = await fetchFn(url, { headers: { Accept: 'application/json' } });
+  } catch (e) {
+    throw new Error(`Form block: couldn’t reach the Ferst platform for form "${id}" (${url}): ${e instanceof Error ? e.message : String(e)}`);
+  }
+  if (res.status === 404) {
+    throw new Error(`Form block: form "${id}" was not found — it may have been archived. Check the id in the portal (Forms), or run \`npx ferst-modules\` to list this site's forms.`);
+  }
+  if (!res.ok) throw new Error(`Form block: the Ferst platform answered ${res.status} for form "${id}" (${url}).`);
+  const def = (await res.json()) as { name: string; submit_label?: string; fields?: FormField[] };
+  return {
+    name: def.name,
+    submitLabel: def.submit_label || 'Send',
+    fields: def.fields ?? [],
+    action: `${base}/forms/${encodeURIComponent(id)}/submit`,
+  };
+}

package/lib/icons.ts

@@ -16,6 +16,16 @@
  * dropped in favour of the entries already here.
  */
 export const ICONS: Record<string, string> = {
+  // ── Shapes added in 0.7.6 (named for what they depict, not for a sector) ──
+  steeple: '<path d="M12 2v3M10.5 3.5h3"></path><path d="M12 5 8 10v11h8V10z"></path><path d="M8 13l-4 2.5V21M16 13l4 2.5V21M3 21h18"></path><path d="M11 21v-3.5a1 1 0 0 1 2 0V21"></path>',
+  cross: '<path d="M12 3v18M7 8h10"></path>',
+  chalice: '<path d="M7 3h10c0 4.2-2.2 7-5 7S7 7.2 7 3z"></path><path d="M12 10v7M8.5 21h7M9.5 17h5"></path>',
+  shell: '<path d="M12 20 4.2 9.5a8.5 8.5 0 0 1 15.6 0z"></path><path d="M12 20 7.4 6.6M12 20V4.6M12 20l4.6-13.4"></path>',
+  jar: '<path d="M9.5 3h5M10.5 3v2.5L8 8.5v10a2.5 2.5 0 0 0 2.5 2.5h3a2.5 2.5 0 0 0 2.5-2.5v-10l-2.5-3V3"></path><path d="M8 13h8"></path>',
+  rings: '<circle cx="9" cy="15" r="5"></circle><circle cx="15" cy="15" r="5"></circle><path d="m15 4.5 1.6 1.6L15 7.7l-1.6-1.6z"></path><path d="M15 7.7V10"></path>',
+  stole: '<path d="M8.5 3c.4 6 .2 12-1.5 18M15.5 3c-.4 6-.2 12 1.5 18"></path><path d="M8.5 3c1.8 1.6 5.2 1.6 7 0"></path><path d="M7.4 17.5h2.4M14.2 17.5h2.4"></path>',
+  candle: '<path d="M12 3c1.1 1.4 1.6 2.4 1.6 3.2a1.6 1.6 0 0 1-3.2 0c0-.8.5-1.8 1.6-3.2z"></path><rect x="9" y="10" width="6" height="11" rx="1"></rect>',
+
   landmark: '<path d="M12 3v4M9 7h6M6 21V10l6-4 6 4v11M6 21h12M10 21v-5h4v5"></path>',
   canopy: '<polygon points="12 3 3 9 21 9"></polygon><line x1="4" y1="9" x2="4" y2="19"></line><line x1="9" y1="9" x2="9" y2="19"></line><line x1="15" y1="9" x2="15" y2="19"></line><line x1="20" y1="9" x2="20" y2="19"></line><line x1="2" y1="22" x2="22" y2="22"></line>',
   drop: '<path d="M12 3c3 4 6 8.5 6 12a6 6 0 1 1-12 0c0-3.5 3-8 6-12z"></path>',

package/lib/links.ts

@@ -1,22 +1,24 @@
-/**
- * The icon a link deserves, read from the link itself — so an editor writes a phone
- * number, an email or a web address and the row shows the right symbol without choosing.
- */
-import type { IconKey } from './icons';
-
-export function linkIcon(href: string): IconKey {
-  if (/^tel:/i.test(href)) return 'phone';
-  if (/^mailto:/i.test(href)) return 'email';
-  if (/^https?:\/\//i.test(href)) return 'globe';
-  return 'arrow';
-}
-
-/** A tel: link from a number as an editor types it (spaces, brackets, a "(0)" dropped). */
-export function telHref(phone: string): string {
-  return 'tel:' + phone.replace(/\(0\)/g, '').replace(/[^\d+]/g, '');
-}
-
-/** A mailto: link, with an optional pre-filled subject. */
-export function mailtoHref(email: string, subject?: string): string {
-  return `mailto:${email}${subject ? `?subject=${encodeURIComponent(subject)}` : ''}`;
-}
+/**
+ * The icon a link deserves, read from the link itself — so an editor writes a phone
+ * number, an email or a web address and the row shows the right symbol without choosing.
+ */
+import type { IconKey } from './icons';
+
+export function linkIcon(href: string): IconKey {
+  if (/^tel:/i.test(href)) return 'phone';
+  if (/^mailto:/i.test(href)) return 'email';
+  if (/^https?:\/\//i.test(href)) return 'globe';
+  return 'arrow';
+}
+
+/** A tel: link from a number as an editor types it (spaces, brackets, a "(0)" dropped). */
+export function telHref(phone: string): string {
+  // An extension ("ext. 204", "x204", "(extension 204)") is shown but never dialled.
+  const number = phone.replace(/\(?\s*(?:ext\.?|extension|x)\s*\d+\s*\)?\s*$/i, '');
+  return 'tel:' + number.replace(/\(0\)/g, '').replace(/[^\d+]/g, '');
+}
+
+/** A mailto: link, with an optional pre-filled subject. */
+export function mailtoHref(email: string, subject?: string): string {
+  return `mailto:${email}${subject ? `?subject=${encodeURIComponent(subject)}` : ''}`;
+}

package/lib/nav.ts

@@ -0,0 +1,12 @@
+/**
+ * The header's call-to-action button (navbarSettings.cta) wins over a plain menu link to
+ * the same place, so a site never shows Contact twice (once as a link, once as the button).
+ * Migrated sites' old menus almost always carry a Contact link. Pure.
+ */
+const norm = (href: string) => href.replace(/\/+$/, '') || '/';
+
+export function navWithoutCta<T extends { href: string }>(links: T[], cta: { href: string } | null | undefined): T[] {
+  if (!cta) return links;
+  const target = norm(cta.href);
+  return links.filter((l) => norm(l.href) !== target);
+}

package/lib/siteSettings.ts

@@ -27,7 +27,7 @@ import {
 
 export type LoadedSiteSettings = SiteSettings &
   LogoSettings & {
-    navigation: { primary: NavLink[]; footer: NavLink[]; dropdown?: NavGroup; cta: { label: string; href: string } | null };
+    navigation: { primary: NavLink[]; footer: NavLink[]; footerGroups: Array<{ heading: string; links: NavLink[] }>; dropdown?: NavGroup; cta: { label: string; href: string } | null };
     /** Client-provided design-token overrides (empty objects if none). */
     theme: ThemeSettings;
   };
@@ -51,6 +51,7 @@ export async function loadSiteSettings(): Promise<LoadedSiteSettings> {
     navigation: {
       primary: navbarSettingsSchema.parse(navbarEntry?.data ?? {}).primary,
       footer: footerSettingsSchema.parse(footerEntry?.data ?? {}).footer,
+      footerGroups: footerSettingsSchema.parse(footerEntry?.data ?? {}).groups,
       dropdown: navbarSettingsSchema.parse(navbarEntry?.data ?? {}).dropdown,
       cta: navbarSettingsSchema.parse(navbarEntry?.data ?? {}).cta,
     },

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ferst-core",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "type": "module",
-  "description": "Ferst Core — the shared, brand-agnostic client-site system: Astro components, layouts, content schemas, the layered config resolver, and a neutral styling architecture that every client overrides.",
+  "description": "Ferst Core \u2014 the shared, brand-agnostic client-site system: Astro components, layouts, content schemas, the layered config resolver, and a neutral styling architecture that every client overrides.",
   "license": "BUSL-1.1",
   "author": "MyAI4 Ltd (https://ferst.co.uk)",
   "homepage": "https://ferst.co.uk",
@@ -42,6 +42,7 @@
     "routes",
     "utils",
     "styles",
+    "fonts",
     "README.md",
     "NOTICE",
     "LICENSE",
@@ -51,7 +52,8 @@
     "ferst-check-thin": "bin/check-thin.mjs",
     "ferst-set-cms-branch": "bin/set-cms-branch.mjs",
     "ferst-cms-config": "bin/cms-config.mjs",
-    "ferst-update": "bin/ferst-update.mjs"
+    "ferst-update": "bin/ferst-update.mjs",
+    "ferst-modules": "bin/ferst-modules.mjs"
   },
   "dependencies": {
     "zod": "^3.25.0"