@glw907/cairn-cms 0.62.2 → 0.76.0

package/src/lib/render/sanitize-schema.ts

@@ -1,6 +1,7 @@
 import { defaultSchema, type Schema } from 'hast-util-sanitize';
 import type { Root, Element } from 'hast';
 import { visit } from 'unist-util-visit';
+import { toString } from 'hast-util-to-string';
 import { dataAttrProp, type ComponentRegistry } from './registry.js';
 
 // The fixed directive markers the stamp writes and the dispatch reads. They are inert data
@@ -22,7 +23,7 @@ export function buildSanitizeSchema(
   registry: ComponentRegistry,
   extend?: (defaults: Schema) => Schema,
 ): Schema {
-  const attrMarkers = registry.defs.flatMap((d) => (d.attributes ?? []).map((a) => dataAttrProp(a.key)));
+  const attrMarkers = registry.defs.flatMap((d) => Object.keys(d.attributes ?? {}).map((key) => dataAttrProp(key)));
   const markers = [...FIXED_MARKERS, ...attrMarkers];
   const attributes = defaultSchema.attributes ?? {};
   // defaultSchema's `a` entry carries a className tuple (`['className', 'data-footnote-backref']`)
@@ -68,6 +69,36 @@ export function rehypeAnchorRel(rel: string) {
   };
 }
 
+/**
+ * Give every GFM task-list checkbox an accessible name from its item text. remark-gfm emits a real
+ * `<input type="checkbox" disabled>` with no label, which axe's `label` rule flags as a critical
+ * violation even though the control is read-only; the visible label is the surrounding `<li>` text,
+ * not associated programmatically. This sets `aria-label` on each task-list checkbox to its item's
+ * text so the name travels with the control, keeping the engine's real disabled input (the bar's
+ * non-color cue) while clearing the violation on every site. It must run after the sanitize floor,
+ * which does not allow `aria-label`, so the attribute is added once the floor has run.
+ */
+export function rehypeTaskListA11y() {
+  return (tree: Root) => {
+    visit(tree, 'element', (node: Element) => {
+      const className = node.properties?.className;
+      const isTaskItem =
+        node.tagName === 'li' && Array.isArray(className) && className.includes('task-list-item');
+      if (!isTaskItem) return;
+      const checkbox = node.children.find(
+        (child): child is Element =>
+          child.type === 'element' &&
+          child.tagName === 'input' &&
+          child.properties?.type === 'checkbox',
+      );
+      if (!checkbox) return;
+      const label = toString(node).trim();
+      // Only when there is text to name it; an empty item leaves the box unnamed rather than blank.
+      if (label) (checkbox.properties ??= {})['ariaLabel'] = label;
+    });
+  };
+}
+
 // URL-bearing hast properties the post-dispatch guard scheme-checks. hast camelCases attribute
 // names through property-information (srcset -> srcSet, xlink:href -> xLinkHref with a capital L,
 // formaction -> formAction). data is the <object data> URL attribute; data-* attributes camelCase

package/src/lib/sveltekit/cairn-admin.ts

@@ -22,7 +22,7 @@ import { createEditorRoutes } from './editors-routes.js';
 import { createNavRoutes, type NavLoadData } from './nav-routes.js';
 import type { AuthBranding, SendMagicLink } from '../email.js';
 import type { AuthEnv, Editor } from '../auth/types.js';
-import type { GithubKeyEnv } from '../github/credentials.js';
+import type { BackendEnv } from '../github/credentials.js';
 import type { CairnRuntime } from '../content/types.js';
 import type { CookieJar, EventBase } from './types.js';
 
@@ -31,20 +31,20 @@ import type { CookieJar, EventBase } from './types.js';
  * (ContentEvent minus params, which the dispatcher synthesizes, plus RequestContext's cookies
  * and setHeaders). A real SvelteKit RequestEvent satisfies it.
  */
-export interface AdminEvent extends EventBase<GithubKeyEnv & AuthEnv> {
+export interface AdminEvent extends EventBase<BackendEnv & AuthEnv> {
   cookies: CookieJar;
   setHeaders(headers: Record<string, string>): void;
 }
 
 /**
  * Injectable dependencies. Branding defaults from the runtime's siteName and sender, so a
- *  site overrides it only to change the magic-link email identity; `send` and `mintToken`
- *  are the same seams the underlying factories take.
+ *  site overrides it only to change the magic-link email identity; `send` is the same seam the
+ *  underlying auth factory takes. The content backend rides `event.locals.backend` (the dev double)
+ *  or the adapter's provider, so it is not a dep here.
  */
 export interface CairnAdminDeps {
   branding?: AuthBranding;
   send?: SendMagicLink;
-  mintToken?: ContentRoutesDeps['mintToken'];
   /**
    * Build the Anthropic client for the tidy action. Forwarded to the content routes; a site that
    *  enables tidy injects a stub here to avoid a real network call. Defaults to the real SDK client.
@@ -83,13 +83,12 @@ export function createCairnAdmin(runtime: CairnRuntime, deps: CairnAdminDeps = {
   };
   const auth = createAuthRoutes({ branding, send: deps.send });
   const content = createContentRoutes(runtime, {
-    mintToken: deps.mintToken,
     anthropic: deps.anthropic,
     tidyTimeoutMs: deps.tidyTimeoutMs,
   });
   const editors = createEditorRoutes();
   // The nav surface exists only when the site configures a menu; without one its view is a 404.
-  const nav = runtime.navMenu ? createNavRoutes(runtime, { mintToken: deps.mintToken }) : null;
+  const nav = runtime.navMenu ? createNavRoutes(runtime) : null;
 
   /**
    * Build the event a wrapped content load reads. The catch-all route carries only a rest
@@ -111,8 +110,8 @@ export function createCairnAdmin(runtime: CairnRuntime, deps: CairnAdminDeps = {
 
   /**
    * Serve the admin view the pathname names, or a 404 for any shape the parser refuses.
-   *  The authed views run the layout load and the view load concurrently; both mint a GitHub
-   *  token, and the installation-token cache coalesces the mints into one signing.
+   *  The authed views run the layout load and the view load concurrently; both resolve the same
+   *  backend, and the installation-token cache coalesces their lazy mints into one signing.
    */
   async function load(event: AdminEvent): Promise<AdminData> {
     const view = parseAdminPath(event.url.pathname, runtime.concepts);