@brandon_m_behring/book-scaffold-astro 4.1.0 → 4.1.2

package/components/PocLayout.astro

@@ -11,12 +11,7 @@
  * Closed `kind` union: discriminated literal type. To add a 6th kind in
  * a future release, expand the union + add a CSS block in poc-layouts.css.
  */
-export type PocLayoutKind =
-  | 'tutorial'
-  | 'how-to'
-  | 'tldr'
-  | 'part-summary'
-  | 'cheat-sheet';
+export type PocLayoutKind = 'tutorial' | 'how-to' | 'tldr' | 'part-summary' | 'cheat-sheet';
 
 interface Props {
   kind: PocLayoutKind;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@brandon_m_behring/book-scaffold-astro",
   "description": "Astro 6 + MDX toolkit for long-form technical books. Profile-aware (academic / tools / minimal); ships Tufte typography, KaTeX, BibTeX citations, Pagefind, Cloudflare Workers deploy. See PACKAGE_DESIGN.md for the API contract.",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "type": "module",
   "license": "MIT",
   "author": "Brandon Behring",

package/scripts/build-labels.mjs

@@ -34,7 +34,8 @@
  * Designed to run in <2 s on a medium book.
  */
 import { readFile, writeFile, mkdir, readdir } from 'node:fs/promises';
-import { resolve, join, basename, dirname } from 'node:path';
+import { resolve, relative, join, basename, dirname } from 'node:path';
+import { readChaptersBase } from './walk-mdx.mjs';
 
 // --help / -h: non-mutating (closes #14).
 const USAGE = `Usage: book-scaffold build-labels
@@ -56,7 +57,15 @@ if (process.argv.includes('--help') || process.argv.includes('-h')) {
   process.exit(0);
 }
 
-const CHAPTERS_DIR = process.env.BOOK_CHAPTERS_DIR ?? 'src/content/chapters';
+// v4.1.1 (closes #63): readChaptersBase honors BOOK_CHAPTERS_DIR env (when set)
+// then parses the consumer's content.config.{ts,mjs,js} for a `chapters`
+// collection `loader.base` override. Multi-guide consumers use
+// `src/content/<guide-slug>/` rather than the Astro 5 default.
+const CHAPTERS_DIR_ABS = await readChaptersBase(process.cwd());
+// build-labels uses CHAPTERS_DIR as a path relative to cwd elsewhere in the
+// script (joined with `walkMdx`). Convert the absolute path back to relative
+// for compatibility with the existing call sites.
+const CHAPTERS_DIR = relative(process.cwd(), CHAPTERS_DIR_ABS) || 'src/content/chapters';
 const OUTPUT_PATH = process.env.BOOK_LABELS_OUT ?? 'src/data/labels.json';
 
 /** Component names that participate in cross-referencing. */

package/scripts/validate.mjs

@@ -28,7 +28,7 @@
 import { readFile, access } from 'node:fs/promises';
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve, dirname, join } from 'node:path';
-import { walkMdx } from './walk-mdx.mjs';
+import { walkMdx, readChaptersBase } from './walk-mdx.mjs';
 
 /**
  * Best-effort .env reader. Mirrors `readEnvFile` in src/types.ts; kept inline
@@ -95,7 +95,11 @@ const presetFromFlag = presetFlagIdx >= 0 ? argv[presetFlagIdx + 1] : undefined;
 // Resolves issue #8 — three reference consumers reported "0 chapter(s) checked"
 // because ROOT was the package directory inside node_modules.
 const ROOT = process.cwd();
-const CHAPTERS_DIR = resolve(ROOT, 'src/content/chapters');
+// v4.1.1 (closes #63): read the consumer's content.config.{ts,mjs,js} to
+// honor `loader.base` overrides (multi-guide pattern uses
+// `src/content/<guide-slug>/` instead of the Astro 5 default).
+// Falls back to `src/content/chapters` when no override / no config file.
+const CHAPTERS_DIR = await readChaptersBase(ROOT);
 const PUBLIC_DIR = resolve(ROOT, 'public');
 const DATA_DIR = resolve(ROOT, 'src/data');
 

package/scripts/walk-mdx.mjs

@@ -12,8 +12,9 @@
  * Output: relative paths in POSIX form ("subdir/file.mdx"), matching what
  * the previous `glob('**\/*.{md,mdx}', { cwd })` produced.
  */
-import { readdir } from 'node:fs/promises';
-import { join, relative } from 'node:path';
+import { readFile, readdir } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import { join, relative, resolve } from 'node:path';
 
 export async function* walkMdx(dir, baseDir = dir) {
   let entries;
@@ -32,3 +33,68 @@ export async function* walkMdx(dir, baseDir = dir) {
     }
   }
 }
+
+/**
+ * Read the consumer's `content.config.ts` (or `.mjs` / `.js`) and extract
+ * the `loader.base` path for the `chapters` content collection.
+ *
+ * v4.1.1 (closes #63): consumers in the multi-guide / multi-book pattern
+ * override the chapters dir to `src/content/<guide-slug>` rather than the
+ * Astro 5 default `src/content/chapters/`. Without this helper,
+ * `book-scaffold validate` + `book-scaffold build-labels` silently report
+ * 0 chapters because they walk the default path. This helper parses the
+ * consumer's config file and returns the actual base path so both scripts
+ * discover the consumer's chapter files.
+ *
+ * Strategy: regex-parse the source file (avoid runtime import; the file
+ * imports from `astro:content` / `astro/loaders` which don't resolve in
+ * plain Node). Matches both single- and double-quoted string literals;
+ * matches paths with or without the `./` prefix.
+ *
+ * Returns the resolved absolute path. Falls back to
+ * `${projectRoot}/src/content/chapters` when:
+ *   - content.config.{ts,mjs,js} doesn't exist
+ *   - the file exists but no `chapters` collection or `loader.base` found
+ *   - the matched base path uses dynamic forms (variables, template literals)
+ *     instead of a string literal
+ *
+ * Honors env override: BOOK_CHAPTERS_DIR (when set) wins over config parse.
+ */
+export async function readChaptersBase(projectRoot) {
+  const envOverride = process.env.BOOK_CHAPTERS_DIR;
+  if (envOverride) {
+    return resolve(projectRoot, envOverride);
+  }
+  const DEFAULT_BASE = resolve(projectRoot, 'src/content/chapters');
+  for (const ext of ['ts', 'mjs', 'js']) {
+    const configPath = join(projectRoot, `src/content.config.${ext}`);
+    if (!existsSync(configPath)) continue;
+    let source;
+    try {
+      source = await readFile(configPath, 'utf8');
+    } catch {
+      return DEFAULT_BASE;
+    }
+    // Look for a `chapters` collection's `loader.base` string. Permissive
+    // form: match the `chapters` identifier, then within the next 500
+    // chars find `base: 'string'` or `base: "string"`. NOT template
+    // literals (which use backticks and may contain ${} interpolation —
+    // those fall back to the default since the value is dynamic).
+    //
+    // Forms matched:
+    //   - `const chapters = defineCollection({ loader: glob({ base: './foo' }) })`
+    //   - `export const collections = { chapters: defineCollection({ loader: glob({ base: './foo' }) }) }`
+    //   - any indentation / line break style
+    const re = /\bchapters\b[\s\S]{0,500}?\bbase\s*:\s*'([^']+)'|\bchapters\b[\s\S]{0,500}?\bbase\s*:\s*"([^"]+)"/;
+    const m = source.match(re);
+    const captured = m && (m[1] || m[2]);
+    if (captured) {
+      return resolve(projectRoot, captured);
+    }
+    // File exists but no override found — assume the consumer uses the
+    // scaffold's defineBookSchemas() default.
+    return DEFAULT_BASE;
+  }
+  // No content.config.{ts,mjs,js} at all — return the Astro 5 default.
+  return DEFAULT_BASE;
+}