ferst-core 0.7.4 → 0.7.6

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

@@ -201,6 +201,7 @@ const metaDescription = description ?? identity.description;
       brandAlt={brandAlt}
       primaryNav={navigation.primary}
       dropdown={navigation.dropdown}
+      cta={navigation.cta}
     />
 
     <main class:list={['site-main', mainClass]} data-content-align={align}>
@@ -214,6 +215,8 @@ const metaDescription = description ?? identity.description;
     <SiteFooter
       facebookUrl={contact.facebookUrl}
       footerLinks={navigation.footer}
+      groups={navigation.footerGroups}
+      cta={navigation.cta}
       footerClass={footerClass}
       shortName={identity.shortName}
       tagline={identity.description}

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,12 +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';
-}
+/**
+ * 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

@@ -1,60 +1,62 @@
-/**
- * Single accessor merging the site-settings content entries into one combined
- * object. Storage is split across small collections (identity+contact, logos,
- * navbar, footer, theme) so each is its own focused Sveltia CMS pane — see
- * `content/schemas.ts`. Consumers read one combined shape though, so this loader
- * re-assembles it (including the `navigation.primary` / `navigation.footer`
- * grouping) at read time — the only place that needs to know storage is split.
- *
- * `getEntry(...)` yields `data` typed per-collection when the entry exists, but
- * the content runtime doesn't always apply nested Zod defaults the way a plain
- * `schema.parse()` does. We re-parse each entry through its own schema so nested
- * defaults are fully populated, including when a file is missing.
- */
-import { getEntry } from 'astro:content';
-import {
-  footerSettingsSchema,
-  logoSettingsSchema,
-  navbarSettingsSchema,
-  siteSettingsSchema,
-  themeSettingsSchema,
-  type LogoSettings,
-  type NavLink,
-  type NavGroup,
-  type SiteSettings,
-  type ThemeSettings,
-} from '../content/schemas';
-
-export type LoadedSiteSettings = SiteSettings &
-  LogoSettings & {
-    navigation: { primary: NavLink[]; footer: NavLink[]; dropdown?: NavGroup };
-    /** Client-provided design-token overrides (empty objects if none). */
-    theme: ThemeSettings;
-  };
-
-let cached: LoadedSiteSettings | null = null;
-
-export async function loadSiteSettings(): Promise<LoadedSiteSettings> {
-  if (cached) return cached;
-
-  const [siteSettingsEntry, logoEntry, navbarEntry, footerEntry, themeEntry] = await Promise.all([
-    getEntry('siteSettings', 'index'),
-    getEntry('logoSettings', 'index'),
-    getEntry('navbarSettings', 'index'),
-    getEntry('footerSettings', 'index'),
-    getEntry('themeSettings', 'index'),
-  ]);
-
-  cached = {
-    ...siteSettingsSchema.parse(siteSettingsEntry?.data ?? {}),
-    ...logoSettingsSchema.parse(logoEntry?.data ?? {}),
-    navigation: {
-      primary: navbarSettingsSchema.parse(navbarEntry?.data ?? {}).primary,
-      footer: footerSettingsSchema.parse(footerEntry?.data ?? {}).footer,
-      dropdown: navbarSettingsSchema.parse(navbarEntry?.data ?? {}).dropdown,
-    },
-    theme: themeSettingsSchema.parse(themeEntry?.data ?? {}),
-  };
-
-  return cached;
-}
+/**
+ * Single accessor merging the site-settings content entries into one combined
+ * object. Storage is split across small collections (identity+contact, logos,
+ * navbar, footer, theme) so each is its own focused Sveltia CMS pane — see
+ * `content/schemas.ts`. Consumers read one combined shape though, so this loader
+ * re-assembles it (including the `navigation.primary` / `navigation.footer`
+ * grouping) at read time — the only place that needs to know storage is split.
+ *
+ * `getEntry(...)` yields `data` typed per-collection when the entry exists, but
+ * the content runtime doesn't always apply nested Zod defaults the way a plain
+ * `schema.parse()` does. We re-parse each entry through its own schema so nested
+ * defaults are fully populated, including when a file is missing.
+ */
+import { getEntry } from 'astro:content';
+import {
+  footerSettingsSchema,
+  logoSettingsSchema,
+  navbarSettingsSchema,
+  siteSettingsSchema,
+  themeSettingsSchema,
+  type LogoSettings,
+  type NavLink,
+  type NavGroup,
+  type SiteSettings,
+  type ThemeSettings,
+} from '../content/schemas';
+
+export type LoadedSiteSettings = SiteSettings &
+  LogoSettings & {
+    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;
+  };
+
+let cached: LoadedSiteSettings | null = null;
+
+export async function loadSiteSettings(): Promise<LoadedSiteSettings> {
+  if (cached) return cached;
+
+  const [siteSettingsEntry, logoEntry, navbarEntry, footerEntry, themeEntry] = await Promise.all([
+    getEntry('siteSettings', 'index'),
+    getEntry('logoSettings', 'index'),
+    getEntry('navbarSettings', 'index'),
+    getEntry('footerSettings', 'index'),
+    getEntry('themeSettings', 'index'),
+  ]);
+
+  cached = {
+    ...siteSettingsSchema.parse(siteSettingsEntry?.data ?? {}),
+    ...logoSettingsSchema.parse(logoEntry?.data ?? {}),
+    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,
+    },
+    theme: themeSettingsSchema.parse(themeEntry?.data ?? {}),
+  };
+
+  return cached;
+}

package/lib/slug.ts

@@ -0,0 +1,32 @@
+/**
+ * Readable anchor ids for headings and document sections (`/sacraments#confirmation`).
+ * `slugify` is pure; `uniqueSlug` de-duplicates within one page using a Set the caller
+ * keeps per request (Astro.locals), so two "Mass times" headings become `mass-times` and
+ * `mass-times-2`.
+ */
+export function slugify(text: string): string {
+  const s = text
+    .normalize('NFKD')
+    .replace(/[̀-ͯ]/g, '') // accents
+    .toLowerCase()
+    .replace(/['’]/g, '') // apostrophes join the word ("joachim's" → "joachims")
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .slice(0, 60)
+    .replace(/-+$/, '');
+  return s || 'section';
+}
+
+export function uniqueSlug(text: string, used: Set<string>): string {
+  const base = slugify(text);
+  let slug = base;
+  for (let n = 2; used.has(slug); n++) slug = `${base}-${n}`;
+  used.add(slug);
+  return slug;
+}
+
+/** The per-page Set of anchor ids already used, kept on Astro.locals. */
+export function pageSlugs(locals: unknown): Set<string> {
+  const bag = (locals ?? {}) as { __ferstSlugs?: Set<string> };
+  return (bag.__ferstSlugs ??= new Set<string>());
+}

package/lib/table.ts

@@ -0,0 +1,10 @@
+/**
+ * Which of a table's columns to show: those with content in at least one body row. A column
+ * that's empty everywhere (e.g. an unused "Evening") is dropped rather than shown blank.
+ * A header-only table keeps all its columns. Pure.
+ */
+export function filledColumns(columns: string[], rows: string[][]): number[] {
+  const all = columns.map((_, i) => i);
+  if (!rows.length) return all;
+  return all.filter((i) => rows.some((r) => (r[i] ?? '').trim() !== ''));
+}

package/package.json

@@ -1,68 +1,69 @@
-{
-  "name": "ferst-core",
-  "version": "0.7.4",
-  "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.",
-  "license": "BUSL-1.1",
-  "author": "MyAI4 Ltd (https://ferst.co.uk)",
-  "homepage": "https://ferst.co.uk",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/MyAI4WebDev/myai4-ferst-core.git",
-    "directory": "packages/core"
-  },
-  "bugs": {
-    "url": "https://github.com/MyAI4WebDev/myai4-ferst-core/issues"
-  },
-  "keywords": [
-    "astro",
-    "astro-component",
-    "cms",
-    "sveltia",
-    "website",
-    "design-tokens",
-    "ferst"
-  ],
-  "scripts": {
-    "test": "vitest run",
-    "test:watch": "vitest"
-  },
-  "sideEffects": [
-    "**/*.css"
-  ],
-  "files": [
-    "bin",
-    "cms",
-    "components",
-    "integration.mjs",
-    "layouts",
-    "content",
-    "examples",
-    "lib",
-    "routes",
-    "utils",
-    "styles",
-    "README.md",
-    "NOTICE",
-    "LICENSE",
-    "LICENSE-Apache-2.0"
-  ],
-  "bin": {
-    "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"
-  },
-  "dependencies": {
-    "zod": "^3.25.0"
-  },
-  "devDependencies": {
-    "vitest": "^3.0.0"
-  },
-  "peerDependencies": {
-    "astro": "^5.0.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "ferst-core",
+  "version": "0.7.6",
+  "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.",
+  "license": "BUSL-1.1",
+  "author": "MyAI4 Ltd (https://ferst.co.uk)",
+  "homepage": "https://ferst.co.uk",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MyAI4WebDev/myai4-ferst-core.git",
+    "directory": "packages/core"
+  },
+  "bugs": {
+    "url": "https://github.com/MyAI4WebDev/myai4-ferst-core/issues"
+  },
+  "keywords": [
+    "astro",
+    "astro-component",
+    "cms",
+    "sveltia",
+    "website",
+    "design-tokens",
+    "ferst"
+  ],
+  "scripts": {
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "sideEffects": [
+    "**/*.css"
+  ],
+  "files": [
+    "bin",
+    "cms",
+    "components",
+    "integration.mjs",
+    "layouts",
+    "content",
+    "examples",
+    "lib",
+    "routes",
+    "utils",
+    "styles",
+    "fonts",
+    "README.md",
+    "NOTICE",
+    "LICENSE",
+    "LICENSE-Apache-2.0"
+  ],
+  "bin": {
+    "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"
+  },
+  "dependencies": {
+    "zod": "^3.25.0"
+  },
+  "devDependencies": {
+    "vitest": "^3.0.0"
+  },
+  "peerDependencies": {
+    "astro": "^5.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}