@brandon_m_behring/book-scaffold-astro 4.25.2 → 4.26.0

package/components/ChapterNav.astro

@@ -1,27 +1,44 @@
 ---
 /**
  * ChapterNav — prev / next chapter links at the bottom of each chapter.
- * Derived from the ordered chapters collection via getNeighbors.
+ *
+ * v4.26.0 (#80): book-aware. `getNeighbors` scopes prev/next to the current
+ * book (multi-book), and links resolve through the `chapterRoute` pattern, so a
+ * multi-book consumer gets `/<book>/<slug>/` links that never bleed across books.
+ * Single-book consumers are byte-identical (defaults → global order + `/chapters/<id>/`).
  */
 import { getNeighbors } from '../src/lib/chapters';
+import { chapterHref } from '../src/lib/nav-href';
+import bookConfig from 'virtual:book-scaffold/book-config';
 
 interface Props {
   currentId: string;
 }
 const { currentId } = Astro.props;
-const { prev, next } = await getNeighbors(currentId);
+
+const chapterRoute = (bookConfig as { chapterRoute?: string }).chapterRoute ?? '/chapters/:id/';
+const bookField = (bookConfig as { bookField?: string }).bookField ?? 'book';
 const baseUrl = (import.meta.env.BASE_URL ?? '/').replace(/\/?$/, '/');
+
+const { prev, next } = await getNeighbors(currentId, { bookField });
+// Resolve hrefs in frontmatter (casts here, never in the JSX expression container).
+const prevHref = prev
+  ? chapterHref({ id: prev.id, data: prev.data as Record<string, unknown> }, chapterRoute, baseUrl, bookField)
+  : null;
+const nextHref = next
+  ? chapterHref({ id: next.id, data: next.data as Record<string, unknown> }, chapterRoute, baseUrl, bookField)
+  : null;
 ---
 {(prev || next) && (
   <nav class="chapter-nav" aria-label="Chapter navigation">
-    {prev && (
-      <a href={`${baseUrl}chapters/${prev.id}/`} class="prev">
+    {prev && prevHref && (
+      <a href={prevHref} class="prev">
         <span class="nav-label">← Previous</span>
         <span class="nav-title">{prev.data.title}</span>
       </a>
     )}
-    {next && (
-      <a href={`${baseUrl}chapters/${next.id}/`} class="next">
+    {next && nextHref && (
+      <a href={nextHref} class="next">
         <span class="nav-label">Next →</span>
         <span class="nav-title">{next.data.title}</span>
       </a>

package/components/EvidenceTag.astro

@@ -84,19 +84,22 @@ const TITLE: Record<Kind, string> = {
   }
   /* Tinted background + matching text/border per kind. Tokens only, so each
    * recolors in the [data-theme="dark"] scope without a dark-block edit. */
+  /* a11y (v4.26.0, #80): the hue is carried by the border + tinted background;
+   * the TEXT uses the high-contrast body color (the accent as small text failed
+   * WCAG-AA 4.5:1 — verified green was 4.35/3.47). */
   .evidence-tag[data-kind="verified"] {
     border-color: var(--warm-green);
-    color: var(--warm-green);
+    color: var(--color-text);
     background: var(--warm-green-tint);
   }
   .evidence-tag[data-kind="inference"] {
     border-color: var(--warm-blue);
-    color: var(--warm-blue);
+    color: var(--color-text);
     background: var(--warm-blue-tint);
   }
   .evidence-tag[data-kind="audit-corrected"] {
     border-color: var(--warm-rose);
-    color: var(--warm-rose);
+    color: var(--color-text);
     background: var(--warm-rose-tint);
   }
 </style>

package/components/NavContent.astro

@@ -0,0 +1,286 @@
+---
+/**
+ * NavContent — the shared chapter-navigation list (v4.26.0, #80).
+ *
+ * Self-contained nav model + markup, rendered by BOTH the desktop `Sidebar`
+ * and the mobile `NavDrawer` so there is ONE nav source. It:
+ *   - reads the chapters collection,
+ *   - derives the CURRENT BOOK from the URL's first path segment (validated
+ *     against the set of books that actually exist), so multi-book consumers
+ *     get a book-SCOPED list on every page type (chapter / book-index /
+ *     apparatus) with no prop threading,
+ *   - resolves every href through the `chapterRoute` token pattern (nav-href),
+ *   - groups by `part` exactly as the old Sidebar did (academic part-enum order
+ *     preserved).
+ *
+ * Backward compatibility: single-book schemas (academic/tools/minimal) have no
+ * `book` field → `knownBooks` is empty → `currentBook` is null → ALL chapters
+ * are shown and `chapterRoute` defaults to `/chapters/:id/` → byte-identical to
+ * the pre-4.26 nav.
+ */
+import { getCollection } from 'astro:content';
+import bookConfig from 'virtual:book-scaffold/book-config';
+import { academicParts } from '../src/schemas';
+import { academicPartHeading } from '../src/lib/academic-parts';
+import { chapterHref, apparatusHref, bookOf, isCurrentChapter, type ChapterLike } from '../src/lib/nav-href';
+
+const profile = import.meta.env.BOOK_PROFILE ?? 'minimal';
+// #142: normalize the base trailing slash (Astro allows base:'/foo' with none).
+const baseUrl = (import.meta.env.BASE_URL ?? '/').replace(/\/*$/, '/');
+
+// v4.26.0 (#80): nav route config (defaults reproduce single-book behavior).
+const chapterRoute = (bookConfig as { chapterRoute?: string }).chapterRoute ?? '/chapters/:id/';
+const bookField = (bookConfig as { bookField?: string }).bookField ?? 'book';
+const apparatusRoute = (bookConfig as { apparatusRoute?: string }).apparatusRoute ?? '/:route/';
+const apparatusRoutes = (bookConfig as { apparatusRoutes?: readonly string[] }).apparatusRoutes ?? [];
+
+const ACADEMIC_PART_ORDER = academicParts;
+const currentPath = Astro.url.pathname;
+
+const rawChapters = await getCollection('chapters', (entry) => !entry.data.draft);
+
+// Derive the current book from the URL (first path segment after BASE_URL),
+// validated against the books that actually exist. Empty set (single-book) →
+// null → no filtering.
+function entryOf(e: (typeof rawChapters)[number]): ChapterLike {
+  return { id: e.id, data: e.data as Record<string, unknown> };
+}
+const knownBooks = new Set(
+  rawChapters.map((e) => bookOf(entryOf(e), bookField)).filter((b): b is string => b !== null),
+);
+const relPath = currentPath.startsWith(baseUrl) ? currentPath.slice(baseUrl.length) : currentPath.replace(/^\//, '');
+const urlBook = relPath.split('/')[0] ?? '';
+const currentBook = knownBooks.has(urlBook) ? urlBook : null;
+
+const scopedChapters = currentBook
+  ? rawChapters.filter((e) => bookOf(entryOf(e), bookField) === currentBook)
+  : rawChapters;
+
+// Pre-shape into render-ready rows (all TS casts in frontmatter — Astro's JSX
+// parser mis-tokenizes casts inside expression containers).
+interface ChapterRow {
+  id: string;
+  partKey: string;
+  prefix: string;
+  title: string;
+  href: string;
+  isCurrent: boolean;
+  sortPart: number;
+  sortRank: number;
+}
+
+function rowOf(entry: (typeof rawChapters)[number]): ChapterRow {
+  const d = entry.data as Record<string, unknown>;
+  const e = entryOf(entry);
+  const href = chapterHref(e, chapterRoute, baseUrl, bookField);
+  const isCurrent = isCurrentChapter(e, currentPath, chapterRoute, baseUrl, bookField);
+  if (profile === 'academic') {
+    const week = (d.week as number) ?? 0;
+    return {
+      id: entry.id,
+      partKey: (d.part as string) ?? '',
+      prefix: `W${String(week).padStart(2, '0')}`,
+      title: (d.title as string) ?? entry.id,
+      href,
+      isCurrent,
+      sortPart: ACADEMIC_PART_ORDER.indexOf((d.part as (typeof ACADEMIC_PART_ORDER)[number]) ?? 'foundations'),
+      sortRank: week,
+    };
+  }
+  const partNum = (d.part as number) ?? 0;
+  const chapter = (d.chapter as number) ?? 0;
+  return {
+    id: entry.id,
+    partKey: String(partNum),
+    prefix: `Ch${chapter}`,
+    title: (d.title as string) ?? entry.id,
+    href,
+    isCurrent,
+    sortPart: partNum,
+    sortRank: chapter,
+  };
+}
+
+const rows: ChapterRow[] = scopedChapters.map(rowOf).sort((a, b) => {
+  if (a.sortPart !== b.sortPart) return a.sortPart - b.sortPart;
+  return a.sortRank - b.sortRank;
+});
+
+const byPart = new Map<string, ChapterRow[]>();
+if (profile === 'academic') {
+  for (const part of ACADEMIC_PART_ORDER) byPart.set(part, []);
+}
+for (const r of rows) {
+  if (!byPart.has(r.partKey)) byPart.set(r.partKey, []);
+  byPart.get(r.partKey)!.push(r);
+}
+
+// Index link: multi-book → the book's TOC at /<book>/; single-book → /chapters/.
+const chaptersIndexHref = currentBook ? `${baseUrl}${currentBook}/` : `${baseUrl}chapters/`;
+const referencesHref = `${baseUrl}references/`;
+
+// Apparatus links (study-guide routes) — surfaced only when the consumer opts in
+// via `apparatusRoutes`. Book-scoped via the same resolver as chapters.
+const APPARATUS_LABELS: Record<string, string> = {
+  'practice-exam': 'Practice exam',
+  glossary: 'Glossary',
+  flashcards: 'Flashcards',
+  answers: 'Answers',
+};
+const apparatusLinks = apparatusRoutes.map((route) => {
+  const href = apparatusHref(route, currentBook, apparatusRoute, baseUrl);
+  return {
+    href,
+    label: APPARATUS_LABELS[route] ?? route.replace(/-/g, ' '),
+    isCurrent: currentPath === href || currentPath === href.replace(/\/$/, ''),
+  };
+});
+
+function partLabel(key: string): string {
+  if (profile === 'academic') return academicPartHeading(key);
+  return `Part ${key}`;
+}
+---
+
+<nav class="sidebar-nav" aria-label="Chapters">
+  <a
+    href={chaptersIndexHref}
+    class={`sidebar-link sidebar-link-index ${currentPath === chaptersIndexHref ? 'is-current' : ''}`}
+  >
+    All chapters
+  </a>
+  {profile === 'academic' && (
+    <a
+      href={referencesHref}
+      class={`sidebar-link sidebar-link-index ${currentPath === referencesHref ? 'is-current' : ''}`}
+    >
+      References
+    </a>
+  )}
+
+  {Array.from(byPart.entries()).map(([part, list]) => list.length === 0 ? null : (
+    <section class="sidebar-part">
+      <h3 class="sidebar-part-heading">{partLabel(part)}</h3>
+      <ol class="sidebar-list">
+        {list.map((r) => (
+          <li>
+            <a
+              href={r.href}
+              aria-current={r.isCurrent ? 'page' : undefined}
+              class={`sidebar-link ${r.isCurrent ? 'is-current' : ''}`}
+            >
+              <span class="sidebar-week">{r.prefix}</span>
+              <span class="sidebar-chapter-title">{r.title}</span>
+            </a>
+          </li>
+        ))}
+      </ol>
+    </section>
+  ))}
+
+  {apparatusLinks.length > 0 && (
+    <section class="sidebar-part sidebar-apparatus">
+      <h3 class="sidebar-part-heading">Study</h3>
+      <ol class="sidebar-list">
+        {apparatusLinks.map((a) => (
+          <li>
+            <a
+              href={a.href}
+              aria-current={a.isCurrent ? 'page' : undefined}
+              class={`sidebar-link sidebar-link-apparatus ${a.isCurrent ? 'is-current' : ''}`}
+            >
+              <span class="sidebar-chapter-title">{a.label}</span>
+            </a>
+          </li>
+        ))}
+      </ol>
+    </section>
+  )}
+</nav>
+
+<style>
+  .sidebar-nav {
+    display: flex;
+    flex-direction: column;
+    gap: var(--space-4);
+  }
+
+  .sidebar-link-index {
+    display: block;
+    padding: var(--space-2) var(--space-3);
+    border-radius: var(--radius-sm);
+    text-decoration: none;
+    color: var(--color-text);
+    font-weight: 500;
+    margin-bottom: 1px;
+    border-left: 2px solid transparent;
+  }
+  .sidebar-link-index:hover {
+    background: var(--color-bg);
+  }
+  .sidebar-link-index.is-current {
+    background: var(--warm-blue-tint);
+    border-left-color: var(--callout-info);
+  }
+
+  .sidebar-part {
+    border-top: 1px solid var(--color-border);
+    padding-top: var(--space-3);
+  }
+  .sidebar-part:first-of-type {
+    border-top: 0;
+    padding-top: 0;
+  }
+  .sidebar-part-heading {
+    font-family: var(--font-code);
+    font-size: var(--text-xs);
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--color-text-muted);
+    margin: 0 0 var(--space-2) 0;
+    padding: 0 var(--space-3);
+  }
+
+  .sidebar-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+  }
+  .sidebar-list li {
+    margin: 0;
+  }
+  .sidebar-link {
+    display: grid;
+    grid-template-columns: 2.4em 1fr;
+    gap: var(--space-2);
+    align-items: baseline;
+    padding: var(--space-2) var(--space-3);
+    border-radius: var(--radius-sm);
+    text-decoration: none;
+    color: var(--color-text);
+    line-height: var(--leading-normal);
+    border-left: 2px solid transparent;
+  }
+  .sidebar-link:hover {
+    background: var(--color-bg);
+    text-decoration: none;
+  }
+  .sidebar-link.is-current {
+    background: var(--warm-blue-tint);
+    border-left-color: var(--callout-info);
+    font-weight: 500;
+  }
+  .sidebar-week {
+    font-family: var(--font-code);
+    font-size: var(--text-xs);
+    color: var(--color-text-muted);
+    text-transform: uppercase;
+  }
+  .sidebar-chapter-title {
+    color: inherit;
+  }
+  /* Apparatus links carry no chapter-number column → single-column grid. */
+  .sidebar-link-apparatus {
+    grid-template-columns: 1fr;
+  }
+</style>

package/components/Provenance.astro

@@ -131,7 +131,7 @@ const teaser = teaserParts.length ? `How this was made · ${teaserParts.join('
   .provenance-details > summary {
     cursor: pointer;
     font-weight: 500;
-    color: var(--warm-plum);
+    color: var(--color-heading);   /* a11y: plum accent as text failed 4.5:1 */
     letter-spacing: 0.02em;
     list-style: none;
   }
@@ -158,7 +158,7 @@ const teaser = teaserParts.length ? `How this was made · ${teaserParts.join('
     font-size: var(--text-xs);
     text-transform: uppercase;
     letter-spacing: 0.04em;
-    color: var(--warm-plum);
+    color: var(--color-heading);   /* a11y: plum accent as text failed 4.5:1 */
     vertical-align: top;
   }
   .provenance-chip,

package/components/Sidebar.astro

@@ -1,107 +1,28 @@
 ---
 /**
- * Sidebar — left-pinned chapter navigation.
+ * Sidebar — left-pinned chapter navigation (desktop ≥64rem).
  *
- * Profile-aware: reads BOOK_PROFILE to decide how to group + sort.
- *   academic: groups by part (foundations / ssm-core / ...), sorts by week
- *   tools/minimal: groups by part (numeric 0-10), sorts by chapter
+ * v4.26.0 (#80): the chapter-list logic moved to `NavContent.astro` (shared with
+ * the mobile `NavDrawer`), which is book-aware — it derives the current book from
+ * the URL and scopes the list, resolving hrefs through the configured
+ * `chapterRoute` pattern. Single-book consumers are unaffected (NavContent's
+ * defaults reproduce the old `/chapters/<id>/` list). Sidebar now owns only the
+ * brand header + the pinned/scrollable shell.
  *
- * Rendered by Base.astro when `showSidebar` is true (default).
- * Hidden below 1024px (`@media (max-width: 64rem)` in layout.css) —
- * mobile gets single-column chapter content with no nav (user reaches
- * the chapter index via /chapters/).
+ * Rendered by Base.astro when `showSidebar` is true (default). Hidden below
+ * 1024px via layout.css — sub-1024 navigation is the NavDrawer (v4.26.0).
  *
- * Visual: ~280px wide, sticky to top, scrollable independently of main.
- * Site title at top doubles as a "home" link.
- *
- * Customize (v4.23.0, #135): the brand reads `defineBookConfig({ title,
- * subtitle })` via the book-config virtual module — consumers set both in
- * astro.config.mjs with zero component overrides. The previous hardcoded
- * strings remain the fallbacks, so existing books render unchanged until
- * they configure a title.
+ * Brand (v4.23.0, #135): reads `defineBookConfig({ title, subtitle })` via the
+ * book-config virtual module; the previous hardcoded strings remain fallbacks.
  */
-import { getCollection } from 'astro:content';
 import bookConfig from 'virtual:book-scaffold/book-config';
-import { academicParts } from '../src/schemas';
-import { academicPartHeading } from '../src/lib/academic-parts';
+import NavContent from './NavContent.astro';
 
-const profile = import.meta.env.BOOK_PROFILE ?? 'minimal';
 const siteTitle = bookConfig.title ?? 'Book';
 const siteSubtitle = bookConfig.subtitle ?? 'A scaffold-astro book';
-const baseUrl = (import.meta.env.BASE_URL ?? '/').replace(/\/?$/, '/');
-
-// Academic profile: part is a string enum. `academicParts` (schemas.ts) is
-// the canonical order, shared with the renderer and ChapterHeader (#95); the
-// "Part {roman} · {name}" labels come from the same academic-parts module.
-const ACADEMIC_PART_ORDER = academicParts;
-
-const rawChapters = await getCollection('chapters', (entry) => !entry.data.draft);
-
-// Pre-shape chapters into render-ready rows. All TS casts happen here in
-// the frontmatter so the template stays free of type annotations (Astro's
-// JSX parser mis-tokenizes `as Type<X, Y>` inside expression containers).
-interface ChapterRow {
-  id: string;
-  partKey: string;
-  prefix: string;
-  title: string;
-  sortPart: number;
-  sortRank: number;
-}
-
-function rowOf(entry: typeof rawChapters[number]): ChapterRow {
-  const d = entry.data as Record<string, unknown>;
-  if (profile === 'academic') {
-    const week = (d.week as number) ?? 0;
-    return {
-      id: entry.id,
-      partKey: (d.part as string) ?? '',
-      prefix: `W${String(week).padStart(2, '0')}`,
-      title: (d.title as string) ?? entry.id,
-      sortPart: ACADEMIC_PART_ORDER.indexOf((d.part as typeof ACADEMIC_PART_ORDER[number]) ?? 'foundations'),
-      sortRank: week,
-    };
-  }
-  const partNum = (d.part as number) ?? 0;
-  const chapter = (d.chapter as number) ?? 0;
-  return {
-    id: entry.id,
-    partKey: String(partNum),
-    prefix: `Ch${chapter}`,
-    title: (d.title as string) ?? entry.id,
-    sortPart: partNum,
-    sortRank: chapter,
-  };
-}
-
-const rows: ChapterRow[] = rawChapters.map(rowOf).sort((a, b) => {
-  if (a.sortPart !== b.sortPart) return a.sortPart - b.sortPart;
-  return a.sortRank - b.sortRank;
-});
-
-// Group rows by part. Academic profile uses the ACADEMIC_PART_ORDER as
-// the canonical key sequence so empty parts still appear (in part headers
-// rather than gaps).
-const byPart = new Map<string, ChapterRow[]>();
-if (profile === 'academic') {
-  for (const part of ACADEMIC_PART_ORDER) byPart.set(part, []);
-}
-for (const r of rows) {
-  if (!byPart.has(r.partKey)) byPart.set(r.partKey, []);
-  byPart.get(r.partKey)!.push(r);
-}
-
-const currentPath = Astro.url.pathname;
-const chaptersIndexHref = `${baseUrl}chapters/`;
-const referencesHref = `${baseUrl}references/`;
-function isCurrent(id: string): boolean {
-  return currentPath === `${baseUrl}chapters/${id}/` || currentPath === `${baseUrl}chapters/${id}`;
-}
-
-function partLabel(key: string): string {
-  if (profile === 'academic') return academicPartHeading(key);
-  return `Part ${key}`;
-}
+// #142: Astro does not guarantee a trailing slash on `base` — normalize so the
+// home link is `${base}/`, not a slash-less `/foo`.
+const baseUrl = (import.meta.env.BASE_URL ?? '/').replace(/\/*$/, '/');
 ---
 
 <aside class="sidebar" aria-label="Chapter navigation">
@@ -111,41 +32,7 @@ function partLabel(key: string): string {
       <span class="sidebar-subtitle">{siteSubtitle}</span>
     </a>
 
-    <nav class="sidebar-nav">
-      <a
-        href={chaptersIndexHref}
-        class={`sidebar-link sidebar-link-index ${currentPath === chaptersIndexHref ? 'is-current' : ''}`}
-      >
-        All chapters
-      </a>
-      {profile === 'academic' && (
-        <a
-          href={referencesHref}
-          class={`sidebar-link sidebar-link-index ${currentPath === referencesHref ? 'is-current' : ''}`}
-        >
-          References
-        </a>
-      )}
-
-      {Array.from(byPart.entries()).map(([part, list]) => list.length === 0 ? null : (
-        <section class="sidebar-part">
-          <h3 class="sidebar-part-heading">{partLabel(part)}</h3>
-          <ol class="sidebar-list">
-            {list.map((r) => (
-              <li>
-                <a
-                  href={`${baseUrl}chapters/${r.id}/`}
-                  class={`sidebar-link ${isCurrent(r.id) ? 'is-current' : ''}`}
-                >
-                  <span class="sidebar-week">{r.prefix}</span>
-                  <span class="sidebar-chapter-title">{r.title}</span>
-                </a>
-              </li>
-            ))}
-          </ol>
-        </section>
-      ))}
-    </nav>
+    <NavContent />
   </div>
 </aside>
 
@@ -182,85 +69,4 @@ function partLabel(key: string): string {
     color: var(--color-text-muted);
     margin-top: 0.15em;
   }
-
-  .sidebar-nav {
-    display: flex;
-    flex-direction: column;
-    gap: var(--space-4);
-  }
-
-  .sidebar-link-index {
-    display: block;
-    padding: var(--space-2) var(--space-3);
-    border-radius: var(--radius-sm);
-    text-decoration: none;
-    color: var(--color-text);
-    font-weight: 500;
-    margin-bottom: 1px;
-    border-left: 2px solid transparent;
-  }
-  .sidebar-link-index:hover {
-    background: var(--color-bg);
-  }
-  .sidebar-link-index.is-current {
-    background: var(--warm-blue-tint);
-    border-left-color: var(--callout-info);
-  }
-
-  .sidebar-part {
-    border-top: 1px solid var(--color-border);
-    padding-top: var(--space-3);
-  }
-  .sidebar-part:first-of-type {
-    border-top: 0;
-    padding-top: 0;
-  }
-  .sidebar-part-heading {
-    font-family: var(--font-code);
-    font-size: var(--text-xs);
-    text-transform: uppercase;
-    letter-spacing: 0.04em;
-    color: var(--color-text-muted);
-    margin: 0 0 var(--space-2) 0;
-    padding: 0 var(--space-3);
-  }
-
-  .sidebar-list {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-  }
-  .sidebar-list li {
-    margin: 0;
-  }
-  .sidebar-link {
-    display: grid;
-    grid-template-columns: 2.4em 1fr;
-    gap: var(--space-2);
-    align-items: baseline;
-    padding: var(--space-2) var(--space-3);
-    border-radius: var(--radius-sm);
-    text-decoration: none;
-    color: var(--color-text);
-    line-height: var(--leading-normal);
-    border-left: 2px solid transparent;
-  }
-  .sidebar-link:hover {
-    background: var(--color-bg);
-    text-decoration: none;
-  }
-  .sidebar-link.is-current {
-    background: var(--warm-blue-tint);
-    border-left-color: var(--callout-info);
-    font-weight: 500;
-  }
-  .sidebar-week {
-    font-family: var(--font-code);
-    font-size: var(--text-xs);
-    color: var(--color-text-muted);
-    text-transform: uppercase;
-  }
-  .sidebar-chapter-title {
-    color: inherit;
-  }
 </style>