@glw907/cairn-cms 0.29.0 → 0.34.0

package/src/lib/components/cairn-admin.css

@@ -1,13 +1,24 @@
+/* Cairn's own typeface, self-hosted so the admin needs no external font request. Figtree carries the
+   body and UI (friendly, highly legible at small sizes); Bricolage Grotesque gives the brand and the
+   page headings a distinct voice. Both are variable (one file spans the weight range) and licensed
+   under the SIL Open Font License. The `@font-face` rules are added by scripts/build-admin-css.mjs
+   after compile (so the woff2 url stays relative to the shipped sheet, not the source tree). */
+
 /* Warm Stone: the cairn admin theme. Self-contained, since DaisyUI v5 reads these vars at point
    of use, so this fully overrides the host's theme with no @plugin and no host build step. */
 [data-theme='cairn-admin'] {
   color-scheme: light;
-  font-family: system-ui, -apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+  --font-body: 'Figtree Variable', system-ui, -apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+  --font-display: 'Bricolage Grotesque Variable', var(--font-body);
+  font-family: var(--font-body);
+  /* Crisper, lighter glyph rendering for the variable fonts. */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 
-  --color-base-100: oklch(98.5% 0.004 75);
-  --color-base-200: oklch(96% 0.005 75);
-  --color-base-300: oklch(92% 0.008 75);
-  --color-base-content: oklch(28% 0.012 75);
+  --color-base-100: oklch(99% 0.004 75);
+  --color-base-200: oklch(96.5% 0.006 75);
+  --color-base-300: oklch(89% 0.011 75);
+  --color-base-content: oklch(26% 0.014 75);
 
   --color-primary: oklch(52% 0.2 293);
   --color-primary-content: oklch(98% 0.012 293);
@@ -32,11 +43,155 @@
   --color-subtle: oklch(42% 0.01 75);
 
   --radius-selector: 0.5rem;
-  --radius-field: 0.5rem;
-  --radius-box: 0.75rem;
+  --radius-field: 0.625rem;
+  --radius-box: 1rem;
+  --size-selector: 0.25rem;
+  --size-field: 0.25rem;
+  --border: 1px;
+  --depth: 1;
+  --noise: 0;
+
+  /* Soft, layered elevation: a close contact shadow plus a wide, diffuse one, warm-tinted. The cards
+     float gently instead of sitting in hard boxes, which reads more current than a flat border. */
+  --cairn-shadow: 0 1px 2px oklch(28% 0.02 75 / 0.05), 0 8px 24px -6px oklch(28% 0.02 75 / 0.1);
+  /* A faint hairline for the floating cards in light, where the shadow carries the definition. */
+  --cairn-card-border: oklch(93% 0.008 75);
+}
+
+/* Warm Stone, dark. Mirrors the light palette in dark tones, keeping the same hues (the warm 75 and
+   the violet 293 primary) so the admin reads as one theme under either mode. DaisyUI v5 reads these
+   at point of use, so the compiled component classes need no change. The muted and subtle tones keep
+   >= 4.5:1 contrast on the dark bases. The polish pass tunes these values against the reference. */
+[data-theme='cairn-admin-dark'] {
+  color-scheme: dark;
+  --font-body: 'Figtree Variable', system-ui, -apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+  --font-display: 'Bricolage Grotesque Variable', var(--font-body);
+  font-family: var(--font-body);
+  /* Crisper, lighter glyph rendering for the variable fonts. */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Dark surface layering: the panels (sidebar, topbar, cards = base-100) lift clearly above the app
+     background (base-200, the deepest tone), with base-300 borders lighter still for a visible edge.
+     The wider base-100-to-base-200 gap is what reads as depth on dark, since shadows barely show. */
+  --color-base-100: oklch(24% 0.01 75);
+  --color-base-200: oklch(15.5% 0.009 75);
+  --color-base-300: oklch(30% 0.014 75);
+  --color-base-content: oklch(93% 0.006 75);
+
+  --color-primary: oklch(68% 0.18 293);
+  --color-primary-content: oklch(20% 0.04 293);
+  --color-secondary: oklch(72% 0.02 75);
+  --color-secondary-content: oklch(20% 0.008 75);
+  --color-accent: oklch(70% 0.14 300);
+  --color-accent-content: oklch(20% 0.04 300);
+  --color-neutral: oklch(80% 0.01 75);
+  --color-neutral-content: oklch(22% 0.008 75);
+
+  --color-info: oklch(72% 0.12 240);
+  --color-info-content: oklch(20% 0.04 240);
+  --color-success: oklch(70% 0.12 150);
+  --color-success-content: oklch(20% 0.04 150);
+  --color-warning: oklch(80% 0.14 70);
+  --color-warning-content: oklch(24% 0.05 70);
+  --color-error: oklch(70% 0.18 25);
+  --color-error-content: oklch(20% 0.04 25);
+
+  /* Accessible muted text tones on the dark bases. */
+  --color-muted: oklch(72% 0.01 75);
+  --color-subtle: oklch(80% 0.008 75);
+
+  --radius-selector: 0.5rem;
+  --radius-field: 0.625rem;
+  --radius-box: 1rem;
   --size-selector: 0.25rem;
   --size-field: 0.25rem;
   --border: 1px;
   --depth: 1;
   --noise: 0;
+
+  /* On dark, a soft shadow barely registers, so it is deeper and darker to still lift the cards. */
+  --cairn-shadow: 0 1px 2px oklch(0% 0 0 / 0.35), 0 8px 24px -6px oklch(0% 0 0 / 0.5);
+  /* On dark the shadow does little, so the card keeps a visible border for definition. */
+  --cairn-card-border: oklch(30% 0.014 75);
+}
+
+/* The scoped reset that replaces global Preflight (which the admin sheet omits). It applies only
+   inside the admin theme roots, so it never reaches the host's pages. The dark root has no variables
+   yet (plan 2 adds them); naming it here is harmless and keeps the reset stable across both themes. */
+[data-theme='cairn-admin'] *,
+[data-theme='cairn-admin'] *::before,
+[data-theme='cairn-admin'] *::after,
+[data-theme='cairn-admin-dark'] *,
+[data-theme='cairn-admin-dark'] *::before,
+[data-theme='cairn-admin-dark'] *::after {
+  box-sizing: border-box;
+}
+
+/* Anchors inherit their color and drop the underline by default, which the omitted Preflight used to
+   do. This lives in the `components` layer, below `utilities`, so a Tailwind utility (a `text-*`
+   color, a `hover:underline`) and DaisyUI's own `.link`/`.breadcrumbs` rules (which sit in the
+   utilities layer) all override it. Cascade layers resolve before specificity, so an unlayered reset
+   here would instead beat every utility and silently kill those hover and link affordances. */
+@layer components {
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) a {
+    color: inherit;
+    text-decoration: none;
+  }
+
+  /* Collapsible nav sections use a native <details>. Hide the default disclosure marker and rotate
+     the caret to point down when the section is open. Scoped to the admin, components layer so a
+     utility still wins. */
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) summary {
+    list-style: none;
+  }
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) summary::-webkit-details-marker {
+    display: none;
+  }
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) .cairn-caret {
+    transition: rotate 150ms ease;
+  }
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) details[open] > summary .cairn-caret {
+    rotate: 90deg;
+  }
+
+  /* Selected text picks up the brand violet, so highlighting reads as Cairn rather than the browser
+     default blue. A light tint keeps the text legible. */
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) ::selection {
+    background-color: color-mix(in oklch, var(--color-primary) 24%, transparent);
+  }
+
+  /* One brand-violet keyboard-focus ring across the admin, so every control shows the same clear
+     focus, including the links, nav items, and summaries that the browser would otherwise outline in
+     its default color. Only keyboard focus triggers it. */
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) :focus-visible {
+    outline: 2px solid var(--color-primary);
+    outline-offset: 2px;
+  }
+
+  /* The primary action carries a soft violet lift that grows on hover, so the main call to action
+     reads as raised and current rather than a flat fill. The mix adapts to the theme's primary. */
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) .btn-primary:not(:disabled) {
+    box-shadow:
+      0 1px 2px color-mix(in oklch, var(--color-primary) 22%, transparent),
+      0 6px 16px -5px color-mix(in oklch, var(--color-primary) 38%, transparent);
+  }
+  :where([data-theme='cairn-admin'], [data-theme='cairn-admin-dark']) .btn-primary:not(:disabled):hover {
+    box-shadow:
+      0 2px 4px color-mix(in oklch, var(--color-primary) 26%, transparent),
+      0 10px 24px -5px color-mix(in oklch, var(--color-primary) 48%, transparent);
+  }
+}
+
+/* Respect a reduced-motion preference inside the admin. DaisyUI's modal, drawer, and the admin's
+   own hover transitions otherwise animate regardless. Scoped to the admin roots, so it never
+   reaches the host's pages. */
+@media (prefers-reduced-motion: reduce) {
+  [data-theme='cairn-admin'] *,
+  [data-theme='cairn-admin-dark'] * {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+    scroll-behavior: auto !important;
+  }
 }

package/src/lib/components/cairn-favicon.ts

@@ -0,0 +1,9 @@
+// The cairn mark as an inline SVG data URL, so an admin browser tab carries Cairn's brand. The fill
+// is a fixed violet near the admin primary, since a favicon cannot read a CSS variable. The path is
+// the same public-domain Temaki cairn used by CairnLogo.svelte.
+const svg =
+  '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" fill="#7c3aed">' +
+  '<path d="M6.28 14C5.56 14 1 13.89 1 12.91C1 11.46 2.16 11.07 3.2 10.81C4.36 10.51 13.18 9.77 13.76 10.07C14.46 10.43 13.52 12.49 12.44 12.77C11.28 13.07 10.21 14 8.48 14C7.05 14 9.69 14 6.28 14ZM6.92 4.5C6.67 4.5 5 4.43 5 3.88C5 3.07 5.75 2.51 5.96 2.35C6.36 2.03 6.32 1.62 6.54 1.27C6.84 0.79 7.61 0.5 7.88 0.5C8.1 0.5 8.75 0.9 9.23 1.42C9.45 1.66 10 2.77 10 3.12C10 4.22 9.36 4.5 8.85 4.5C8.33 4.5 8.15 4.5 6.92 4.5ZM3.68 8.22C3 7.73 3.67 6.86 4.57 6.21C5.38 5.63 5.92 5.96 6.79 5.7C8.33 5.24 9.02 5.72 9.02 5.72L10.9 6.82C12.03 7.63 10.99 7.67 10.38 8.56C9.79 9.42 8.18 9.11 7.42 9.33C6.78 9.53 5.75 9.71 4.62 8.9L3.68 8.22Z"/></svg>';
+
+/** The cairn mark as a `data:image/svg+xml` URL, for a `<link rel="icon">` on the admin pages. */
+export const cairnFaviconHref = `data:image/svg+xml,${encodeURIComponent(svg)}`;

package/src/lib/components/chrome-guard.ts

@@ -0,0 +1,62 @@
+// Dev-only structural check that catches a host mounting the admin inside its own chrome. Every admin
+// rule is scoped and the admin self-styles, but a host whose root layout wraps the admin in a
+// width-constraining container (a `<main class="container">`) or renders its nav and footer around it
+// breaks the full-bleed admin shell. The engine cannot prevent that layout mistake, so it names it.
+// The check walks the ancestor chain once on mount and emits one console.error that points at the
+// route-structure doc. The public entry runs only under import.meta.env.DEV, never throws, and changes
+// no rendering.
+
+const DOC = 'docs/admin-route-structure.md';
+
+// max-width values that do not actually constrain the admin below the viewport. A host that sets a
+// defensive `max-width: 100%` or `100vw` on a wrapper is not chrome, so skip those to avoid a spurious
+// dev error. A real constraining container uses an absolute length (`64rem`, `1280px`) or a sub-100
+// percentage, both of which still trip the guard.
+const NON_CONSTRAINING = new Set(['none', '100%', '100vw']);
+
+function describe(el: Element): string {
+	const tag = el.tagName.toLowerCase();
+	const cls = el.getAttribute('class');
+	return cls ? `<${tag} class="${cls}">` : `<${tag}>`;
+}
+
+/**
+ * Inspect the admin root's ancestor chain for host chrome. Returns a diagnostic when a
+ * width-constraining ancestor sits between the root and <body>, else null. Pure over the DOM so a
+ * test can build either shape. The sibling signal (host elements outside the admin subtree) is folded
+ * into the message as context rather than raised on its own, because it is the noisier of the two.
+ */
+export function detectChromeWrap(root: HTMLElement): string | null {
+	const body = root.ownerDocument.body;
+	let constrainer: HTMLElement | null = null;
+	let maxWidth = '';
+	for (let el = root.parentElement; el && el !== body; el = el.parentElement) {
+		const elMaxWidth = getComputedStyle(el).maxWidth;
+		if (elMaxWidth && !NON_CONSTRAINING.has(elMaxWidth)) {
+			constrainer = el;
+			maxWidth = elMaxWidth;
+			break;
+		}
+	}
+	if (!constrainer) return null;
+
+	const siblings = [...body.children].filter(
+		(el) => !el.contains(root) && !root.contains(el) && el !== root,
+	);
+	const siblingNote = siblings.length
+		? ` Host elements also sit beside the admin in <body> (${siblings.map(describe).join(', ')}).`
+		: '';
+	return (
+		`[cairn-cms] The admin is rendering inside host chrome. A width-constraining ancestor ` +
+		`${describe(constrainer)} (max-width: ${maxWidth}) sits between the admin root and <body>, so the ` +
+		`admin shell cannot fill the viewport.${siblingNote} Keep the host root layout chrome-free and move ` +
+		`your nav, footer, and app.css into a (site) route group. See ${DOC}.`
+	);
+}
+
+/** Run the check in dev and log one error when host chrome is detected. A no-op in production. */
+export function warnIfChromeWrapped(root: HTMLElement): void {
+	if (!import.meta.env.DEV) return;
+	const problem = detectChromeWrap(root);
+	if (problem) console.error(problem);
+}

package/src/lib/components/fonts/BricolageGrotesque-OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2022 The Bricolage Grotesque Project Authors (https://github.com/ateliertriay/bricolage)
+
+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:
+https://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/src/lib/components/fonts/Figtree-OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2022 The Figtree Project Authors (https://github.com/erikdkennedy/figtree)
+
+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/src/lib/index.ts

@@ -88,8 +88,10 @@ export type { ReferenceOptions } from './render/component-reference.js';
 export { glyph } from './render/glyph.js';
 export type { IconSet } from './render/glyph.js';
 export { remarkDirectiveStamp } from './render/remark-directives.js';
-export { rehypeDispatch, iconSpan, cardShell, headRow } from './render/rehype-dispatch.js';
-export type { MakeIcon } from './render/rehype-dispatch.js';
+// The component-authoring helpers (iconSpan, cardShell, headRow, isElement, strAttr) live on the
+// @glw907/cairn-cms/render subpath, not the root barrel. rehypeDispatch is deliberately not public:
+// createRenderer is the one public render pipeline, so the safe plugin ordering is the only public
+// path. See docs/superpowers/specs/2026-06-05-cairn-render-authoring-surface-design.md.
 export { createRenderer } from './render/pipeline.js';
 export type { RendererOptions } from './render/pipeline.js';
 

package/src/lib/render/authoring.ts

@@ -0,0 +1,7 @@
+// cairn-cms: the component-authoring toolkit (@glw907/cairn-cms/render). A site authoring components
+// through build(ctx) reaches for these hast builders and the string-attribute reader. Curated on
+// purpose: the internal hast helpers (strProp, markFirstList, dataAttrProp) stay internal, and
+// rehypeDispatch is deliberately omitted (createRenderer is the one public render pipeline).
+export { iconSpan, cardShell, headRow, isElement, strAttr } from './rehype-dispatch.js';
+export type { MakeIcon } from './rehype-dispatch.js';
+export type { ComponentContext } from './registry.js';

package/src/lib/render/registry.ts

@@ -82,6 +82,8 @@ export interface ComponentRegistry {
   names: string[];
   get(name: string): ComponentDef | undefined;
   defaultIcon(name: string, role?: string): string | undefined;
+  /** The component's first `type:'icon'` attribute, or undefined when it declares none. */
+  iconField(name: string): AttributeField | undefined;
 }
 
 /** The hast property name carrying one declared attribute from stamp to dispatch, e.g. `tone`
@@ -91,17 +93,35 @@ export function dataAttrProp(key: string): string {
   return `dataAttr${key.charAt(0).toUpperCase()}${key.slice(1)}`;
 }
 
+/** A component's first `type:'icon'` attribute, or undefined when it declares none. Both the
+ *  construction-time guard and the registry's `iconField` derive the icon field from this one
+ *  predicate rather than spelling the `type === 'icon'` find twice. */
+function findIconField(def: ComponentDef): AttributeField | undefined {
+  return def.attributes?.find((field) => field.type === 'icon');
+}
+
 /**
  * Build a registry from a site's component definitions. The single source the render
  * pipeline (directive stamp plus rehype dispatch) and the editor palette both read.
  */
 export function defineRegistry({ components }: { components: ComponentDef[] }): ComponentRegistry {
+  for (const c of components) {
+    if (c.defaultIconByRole && Object.keys(c.defaultIconByRole).length > 0 && !findIconField(c)) {
+      throw new Error(
+        `cairn: component "${c.name}" sets defaultIconByRole but declares no type:'icon' attribute, so the default icon can never render`,
+      );
+    }
+  }
   const byName = new Map(components.map((c) => [c.name, c]));
   return {
     defs: components,
     names: components.map((c) => c.name),
     get: (name) => byName.get(name),
     defaultIcon: (name, role) => (role ? byName.get(name)?.defaultIconByRole?.[role] : undefined),
+    iconField: (name) => {
+      const def = byName.get(name);
+      return def ? findIconField(def) : undefined;
+    },
   };
 }
 

package/src/lib/render/rehype-dispatch.ts

@@ -6,6 +6,13 @@ export function isElement(node: ElementContent | undefined): node is Element {
   return !!node && node.type === 'element';
 }
 
+/** Read a declared string attribute off the component context, returning undefined for a boolean or
+ *  absent value. Replaces the `typeof ctx.attributes[key] === 'string'` narrowing a build repeats. */
+export function strAttr(ctx: ComponentContext, key: string): string | undefined {
+  const value = ctx.attributes[key];
+  return typeof value === 'string' ? value : undefined;
+}
+
 // hast Properties values are PropertyValue (string | number | boolean | array | null).
 // Directive markers (dataPrimitive/dataRole/dataAttr<Key>) are always stamped as strings;
 // this reads them back with that guarantee instead of casting at each call site.
@@ -28,14 +35,14 @@ export function cardShell(classes: string[], body: ElementContent[]): Element {
   return h('section', { className: classes }, [h('div', { className: ['card-body'] }, body)]);
 }
 
-/** Card head row: `<div class="ec-head">[icon]<h2 class="card-title">{title}</h2></div>`.
- *  Pass the title's inline children and an optional pre-built icon element, the way `cardShell`
- *  takes already-built body content. This factors the icon-plus-heading head that a titled
- *  component build would otherwise rebuild by hand (the shape the removed `splitHead` produced). */
-export function headRow(title: ElementContent[], icon?: Element): Element {
+/** Card head row: `<div class="ec-head">[icon]<hN class="card-title">{title}</hN></div>`.
+ *  Pass the title's inline children, an optional pre-built icon element, and an optional heading
+ *  level (default 2). This factors the icon-plus-heading head that a titled component build would
+ *  otherwise rebuild by hand (the shape the removed `splitHead` produced). */
+export function headRow(title: ElementContent[], icon?: Element, level: number = 2): Element {
   const children: ElementContent[] = [];
   if (icon) children.push(icon);
-  children.push(h('h2', { className: ['card-title'] }, title));
+  children.push(h(`h${level}`, { className: ['card-title'] }, title));
   return h('div', { className: ['ec-head'] }, children);
 }
 

package/src/lib/render/remark-directives.ts

@@ -59,7 +59,7 @@ export function remarkDirectiveStamp(registry: ComponentRegistry) {
       const def = registry.get(node.name);
       const attrs = node.attributes ?? {};
       const role = attrs.role || undefined;
-      const iconField = def?.attributes?.find((field) => field.type === 'icon');
+      const iconField = registry.iconField(node.name);
       const iconKey = iconField?.key ?? 'icon';
       let icon = attrs[iconKey] || undefined;
       if (!icon && role) icon = registry.defaultIcon(node.name, role);