@glossarist/concept-browser 0.7.109 → 0.7.110

package/cli/index.mjs

@@ -112,18 +112,30 @@ Environment:
     const faviconCfgIsObject =
       faviconCfg !== null && typeof faviconCfg === 'object' && !Array.isArray(faviconCfg);
 
+    // Defensive field access: loadSiteConfig normalizes snake_case YAML keys
+    // to camelCase at load time, so `source_dir` arrives as `sourceDir`. But
+    // the canonical FaviconConfig schema documents snake_case (matching the
+    // YAML wire format), and Astro's getSiteConfig path does NOT normalize.
+    // Accept both forms so a future change to either loader can't break this.
+    // See src/utils/favicon-config-access.ts for the SSOT + tests.
+    const cfgBasePath       = faviconCfgIsObject ? (faviconCfg.basePath ?? faviconCfg.base_path) : undefined;
+    const cfgSkipDefault    = faviconCfgIsObject ? (faviconCfg.skipDefaultLinks ?? faviconCfg.skip_default_links) === true : false;
+    const cfgLinksHtml      = faviconCfgIsObject ? (faviconCfg.linksHtml ?? faviconCfg.links_html) : undefined;
+    const cfgSourceDir      = faviconCfgIsObject ? (faviconCfg.sourceDir ?? faviconCfg.source_dir) : undefined;
+    const cfgIcons          = faviconCfgIsObject ? faviconCfg.icons : undefined;
+
     let faviconHtml = '';
     let skipDefaultGeneration = false;
 
     if (faviconCfgIsObject) {
       // Object form — honor each declared field.
-      if (faviconCfg.icons && Array.isArray(faviconCfg.icons) && faviconCfg.icons.length > 0) {
+      if (cfgIcons && Array.isArray(cfgIcons) && cfgIcons.length > 0) {
         // Data-driven: build <link> tags from the icons array.
         const basePathForIcons =
-          faviconCfg.base_path ||
+          cfgBasePath ||
           process.env.BASE_PATH?.replace(/\/+$/, '') ||
           '';
-        faviconHtml = faviconCfg.icons.map((icon) => {
+        faviconHtml = cfgIcons.map((icon) => {
           const attrs = [`rel="${icon.rel || 'icon'}"`];
           if (icon.type) attrs.push(`type="${icon.type}"`);
           if (icon.sizes) attrs.push(`sizes="${icon.sizes}"`);
@@ -138,19 +150,19 @@ Environment:
         }).join('\n    ');
         skipDefaultGeneration = true;
       }
-      if (faviconCfg.links_html) {
+      if (cfgLinksHtml) {
         if (faviconHtml) {
           console.warn('  Warning: branding.favicon.icons and links_html are both set; using icons (data form).');
         } else {
           console.warn('  Warning: branding.favicon.links_html is deprecated. Use branding.favicon.icons (data) instead.');
-          faviconHtml = String(faviconCfg.links_html);
+          faviconHtml = String(cfgLinksHtml);
         }
         skipDefaultGeneration = true;
       }
-      if (faviconCfg.source_dir) {
-        const srcDir = resolve(process.cwd(), faviconCfg.source_dir);
+      if (cfgSourceDir) {
+        const srcDir = resolve(process.cwd(), cfgSourceDir);
         if (fs.existsSync(srcDir) && fs.statSync(srcDir).isDirectory()) {
-          console.log(`\n=== FAVICONS (copy from ${faviconCfg.source_dir}) ===\n`);
+          console.log(`\n=== FAVICONS (copy from ${cfgSourceDir}) ===\n`);
           // When the consumer provides a canonical favicon set, also delete
           // the default-generated cruft (apple-touch-icon-*.png, etc.) so
           // it doesn't linger in public/ and pollute the deployment.
@@ -191,12 +203,12 @@ Environment:
               copied++;
             }
           }
-          console.log(`  Copied ${copied} canonical favicon file(s) from ${faviconCfg.source_dir}`);
+          console.log(`  Copied ${copied} canonical favicon file(s) from ${cfgSourceDir}`);
         } else {
           console.warn(`  Warning: branding.favicon.source_dir not found: ${srcDir}`);
         }
       }
-      if (faviconCfg.skip_default_links) {
+      if (cfgSkipDefault) {
         skipDefaultGeneration = true;
       }
     }
@@ -253,7 +265,7 @@ Environment:
       fs.writeFileSync(resolve(publicDir, 'favicon-links.html'), faviconHtml);
       // Apply base_path prefix (issue #173 + BASE_PATH-aware deployments).
       const basePath =
-        (faviconCfgIsObject && faviconCfg.base_path) ||
+        cfgBasePath ||
         process.env.BASE_PATH?.replace(/\/+$/, '') ||
         '';
       if (basePath) {

package/cli/index.ts

@@ -74,16 +74,21 @@ interface FaviconIcon {
 }
 
 interface FaviconConfig {
-  /** Path prefix for all favicon URLs. Defaults to BASE_PATH-aware '/'. */
+  /** Path prefix for all favicon URLs. Accepts both forms because
+   *  loadSiteConfig normalizes snake_case → camelCase at load time. */
   base_path?: string;
+  basePath?: string;
   /** Skip emitting the default <link> block. */
   skip_default_links?: boolean;
-  /** Consumer-declared icons (DATA, not HTML). Replaces the default set. */
+  skipDefaultLinks?: boolean;
+  /** Consumer-declared icons (DATA, not HTML). */
   icons?: FaviconIcon[];
-  /** @deprecated Use `icons` instead. Raw HTML — kept for backward compat. */
+  /** @deprecated Use `icons` instead. */
   links_html?: string;
+  linksHtml?: string;
   /** Consumer-side directory of canonical favicon files. */
   source_dir?: string;
+  sourceDir?: string;
 }
 
 interface BrandingConfig {
@@ -137,13 +142,21 @@ async function runBuildPipeline(config: SiteConfig | null): Promise<void> {
 
   if (faviconCfgObject) {
     const cfg: FaviconConfig = faviconCfgObject;
-    if (cfg.icons && cfg.icons.length > 0) {
+    // Defensive field access: loadSiteConfig normalizes snake_case → camelCase
+    // at load time. Accept both forms.
+    const cfgBasePath: string | undefined    = cfg.basePath ?? cfg.base_path;
+    const cfgSkipDefault: boolean            = (cfg.skipDefaultLinks ?? cfg.skip_default_links) === true;
+    const cfgLinksHtml: string | undefined   = cfg.linksHtml ?? cfg.links_html;
+    const cfgSourceDir: string | undefined   = cfg.sourceDir ?? cfg.source_dir;
+    const cfgIcons: FaviconIcon[] | undefined = cfg.icons;
+
+    if (cfgIcons && cfgIcons.length > 0) {
       // Data-driven: build <link> tags from the icons array.
       const basePathForIcons: string =
-        cfg.base_path ||
+        cfgBasePath ||
         process.env.BASE_PATH?.replace(/\/+$/, '') ||
         '';
-      faviconHtml = cfg.icons.map((icon: FaviconIcon): string => {
+      faviconHtml = cfgIcons.map((icon: FaviconIcon): string => {
         const attrs: string[] = [`rel="${icon.rel || 'icon'}"`];
         if (icon.type) attrs.push(`type="${icon.type}"`);
         if (icon.sizes) attrs.push(`sizes="${icon.sizes}"`);
@@ -156,19 +169,19 @@ async function runBuildPipeline(config: SiteConfig | null): Promise<void> {
       }).join('\n    ');
       skipDefaultGeneration = true;
     }
-    if (cfg.links_html) {
+    if (cfgLinksHtml) {
       if (faviconHtml) {
         console.warn('  Warning: branding.favicon.icons and links_html are both set; using icons (data form).');
       } else {
         console.warn('  Warning: branding.favicon.links_html is deprecated. Use branding.favicon.icons (data) instead.');
-        faviconHtml = String(cfg.links_html);
+        faviconHtml = String(cfgLinksHtml);
       }
       skipDefaultGeneration = true;
     }
-    if (cfg.source_dir) {
-      const srcDir: string = resolve(process.cwd(), cfg.source_dir);
+    if (cfgSourceDir) {
+      const srcDir: string = resolve(process.cwd(), cfgSourceDir);
       if (fs.existsSync(srcDir) && fs.statSync(srcDir).isDirectory()) {
-        console.log(`\n=== FAVICONS (copy from ${cfg.source_dir}) ===\n`);
+        console.log(`\n=== FAVICONS (copy from ${cfgSourceDir}) ===\n`);
         // When the consumer provides a canonical favicon set, also delete
         // the default-generated cruft so it doesn't linger in public/.
         const cruftFiles: readonly string[] = [
@@ -207,12 +220,12 @@ async function runBuildPipeline(config: SiteConfig | null): Promise<void> {
             copied++;
           }
         }
-        console.log(`  Copied ${copied} canonical favicon file(s) from ${cfg.source_dir}`);
+        console.log(`  Copied ${copied} canonical favicon file(s) from ${cfgSourceDir}`);
       } else {
         console.warn(`  Warning: branding.favicon.source_dir not found: ${srcDir}`);
       }
     }
-    if (cfg.skip_default_links) {
+    if (cfgSkipDefault) {
       skipDefaultGeneration = true;
     }
   }
@@ -266,7 +279,7 @@ async function runBuildPipeline(config: SiteConfig | null): Promise<void> {
   if (faviconHtml) {
     fs.writeFileSync(resolve(publicDir, 'favicon-links.html'), faviconHtml);
     const basePath: string =
-      (faviconCfgObject?.base_path) ||
+      (faviconCfgObject ? (faviconCfgObject.basePath ?? faviconCfgObject.base_path) : undefined) ||
       process.env.BASE_PATH?.replace(/\/+$/, '') ||
       '';
     if (basePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.109",
+  "version": "0.7.110",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {

package/src/__tests__/utils/favicon-config-access.test.ts

@@ -0,0 +1,147 @@
+import { describe, it, expect } from 'vitest';
+import {
+  getFaviconBasePath,
+  getFaviconSkipDefaultLinks,
+  getFaviconLinksHtml,
+  getFaviconSourceDir,
+  getFaviconIcons,
+} from '../../utils/favicon-config-access';
+
+/**
+ * Regression test for the snake_case/camelCase mismatch reported against
+ * 0.7.109 (user-filed bug, 2026-08-01):
+ *
+ *   "source_dir reads snake_case — CLI reads faviconCfg.source_dir but
+ *    loadSiteConfig normalizes to sourceDir. Same bug as skip_default_links,
+ *    base_path, links_html. The canonical files never get copied."
+ *
+ * Root cause: two loaders, two conventions.
+ *   - scripts/load-site-config.mjs normalizes snake_case → camelCase.
+ *   - src/lib/site-config.ts (Astro) does NOT normalize.
+ *
+ * Fix: the accessors below accept BOTH forms. They check camelCase first
+ * (the post-normalization form) and fall back to snake_case (the raw YAML
+ * wire form). Either loader's output works.
+ */
+
+describe('getFaviconBasePath', () => {
+  it('returns undefined for null/undefined', () => {
+    expect(getFaviconBasePath(null)).toBeUndefined();
+    expect(getFaviconBasePath(undefined)).toBeUndefined();
+    expect(getFaviconBasePath({})).toBeUndefined();
+  });
+
+  it('reads camelCase basePath', () => {
+    expect(getFaviconBasePath({ basePath: '/vocab/' })).toBe('/vocab/');
+  });
+
+  it('reads snake_case base_path', () => {
+    expect(getFaviconBasePath({ base_path: '/vocab/' })).toBe('/vocab/');
+  });
+
+  it('camelCase wins when both forms are set', () => {
+    expect(getFaviconBasePath({ basePath: '/camel/', base_path: '/snake/' })).toBe('/camel/');
+  });
+});
+
+describe('getFaviconSkipDefaultLinks', () => {
+  it('returns false for null/undefined', () => {
+    expect(getFaviconSkipDefaultLinks(null)).toBe(false);
+    expect(getFaviconSkipDefaultLinks(undefined)).toBe(false);
+    expect(getFaviconSkipDefaultLinks({})).toBe(false);
+  });
+
+  it('reads camelCase skipDefaultLinks', () => {
+    expect(getFaviconSkipDefaultLinks({ skipDefaultLinks: true })).toBe(true);
+    expect(getFaviconSkipDefaultLinks({ skipDefaultLinks: false })).toBe(false);
+  });
+
+  it('reads snake_case skip_default_links', () => {
+    expect(getFaviconSkipDefaultLinks({ skip_default_links: true })).toBe(true);
+  });
+});
+
+describe('getFaviconLinksHtml', () => {
+  it('returns undefined for null/undefined', () => {
+    expect(getFaviconLinksHtml(null)).toBeUndefined();
+    expect(getFaviconLinksHtml({})).toBeUndefined();
+  });
+
+  it('reads camelCase linksHtml', () => {
+    expect(getFaviconLinksHtml({ linksHtml: '<link>' })).toBe('<link>');
+  });
+
+  it('reads snake_case links_html', () => {
+    expect(getFaviconLinksHtml({ links_html: '<link>' })).toBe('<link>');
+  });
+});
+
+describe('getFaviconSourceDir', () => {
+  it('returns undefined for null/undefined', () => {
+    expect(getFaviconSourceDir(null)).toBeUndefined();
+    expect(getFaviconSourceDir({})).toBeUndefined();
+  });
+
+  it('reads camelCase sourceDir', () => {
+    expect(getFaviconSourceDir({ sourceDir: 'assets/favicons' })).toBe('assets/favicons');
+  });
+
+  /**
+   * THE LOAD-BEARING TEST — pins the exact bug the user reported.
+   * "source_dir reads snake_case — CLI reads faviconCfg.source_dir but
+   *  loadSiteConfig normalizes to sourceDir. The canonical files never
+   *  get copied."
+   *
+   * After loadSiteConfig normalization, the config object has sourceDir
+   * (camelCase), NOT source_dir. The accessor must return the value.
+   */
+  it('reads snake_case source_dir (the user-reported regression form)', () => {
+    expect(getFaviconSourceDir({ source_dir: 'assets/favicons' })).toBe('assets/favicons');
+  });
+
+  it('camelCase wins when both forms are set', () => {
+    expect(getFaviconSourceDir({ sourceDir: 'a', source_dir: 'b' })).toBe('a');
+  });
+});
+
+describe('getFaviconIcons', () => {
+  it('returns undefined for null/undefined', () => {
+    expect(getFaviconIcons(null)).toBeUndefined();
+    expect(getFaviconIcons({})).toBeUndefined();
+  });
+
+  it('reads icons (same key in both forms)', () => {
+    const icons = [{ rel: 'icon', href: 'favicon.ico' }];
+    expect(getFaviconIcons({ icons })).toBe(icons);
+  });
+});
+
+describe('regression — both loader outputs work end-to-end', () => {
+  // Simulate the two loader paths:
+  //   - Astro's getSiteConfig (no normalization): snake_case keys preserved
+  //   - CLI's loadSiteConfig (normalizes): camelCase keys
+  const snakeCaseForm = {
+    base_path: '/cie-eilv/',
+    skip_default_links: true,
+    source_dir: 'assets/favicons',
+    links_html: '<link>',
+    icons: [{ rel: 'icon', href: 'favicon.ico' }],
+  };
+  const camelCaseForm = {
+    basePath: '/cie-eilv/',
+    skipDefaultLinks: true,
+    sourceDir: 'assets/favicons',
+    linksHtml: '<link>',
+    icons: [{ rel: 'icon', href: 'favicon.ico' }],
+  };
+
+  for (const [label, cfg] of [['snake_case (Astro)', snakeCaseForm], ['camelCase (CLI)', camelCaseForm]] as const) {
+    it(`accessors return identical values for ${label}`, () => {
+      expect(getFaviconBasePath(cfg)).toBe('/cie-eilv/');
+      expect(getFaviconSkipDefaultLinks(cfg)).toBe(true);
+      expect(getFaviconSourceDir(cfg)).toBe('assets/favicons');
+      expect(getFaviconLinksHtml(cfg)).toBe('<link>');
+      expect(getFaviconIcons(cfg)).toEqual([{ rel: 'icon', href: 'favicon.ico' }]);
+    });
+  }
+});

package/src/layouts/Default.astro

@@ -9,7 +9,7 @@ import {
   type FontConfigLike,
 } from '../utils/font-stack';
 import { resolveFaviconBase } from '../utils/favicon-base';
-import { buildDefaultFaviconLinks, renderFaviconLinkTag } from '../utils/favicon-links';
+import { buildFaviconLinks, renderFaviconLinkTag } from '../utils/favicon-links';
 
 interface Props {
   title: string;

package/src/utils/favicon-config-access.ts

@@ -0,0 +1,68 @@
+/**
+ * Defensive favicon config accessor.
+ *
+ * WHY THIS EXISTS
+ *
+ * `loadSiteConfig` (scripts/load-site-config.mjs) normalizes YAML keys
+ * from snake_case to camelCase at load time. So a YAML config with
+ * `branding.favicon.source_dir: assets/favicons` arrives at the CLI as
+ * `cfg.sourceDir`. But the canonical `FaviconConfig` type documents the
+ * snake_case form (matching the YAML wire format), and Astro's
+ * `getSiteConfig` does NOT normalize — so `Default.astro` sees the raw
+ * snake_case form.
+ *
+ * The 0.7.107–0.7.109 CLI used `cfg.source_dir` directly, which silently
+ * returned `undefined` after the loader's normalization. Canonical files
+ * never got copied. Regression caught by user 2026-08-01.
+ *
+ * The fix: this helper reads BOTH forms. Each accessor takes the config
+ * object and returns whichever form is present. The class of "loader
+ * changed normalization, broke the CLI" is now permanently closed.
+ */
+
+export interface RawFaviconConfig {
+  // snake_case (YAML wire format / Astro path)
+  base_path?: string;
+  skip_default_links?: boolean;
+  links_html?: string;
+  source_dir?: string;
+  icons?: unknown;
+  // camelCase (loadSiteConfig normalized form / TS convention)
+  basePath?: string;
+  skipDefaultLinks?: boolean;
+  linksHtml?: string;
+  sourceDir?: string;
+}
+
+function pick<T>(...vals: Array<T | undefined>): T | undefined {
+  for (const v of vals) {
+    if (v !== undefined && v !== null) return v;
+  }
+  return undefined;
+}
+
+export function getFaviconBasePath(cfg: RawFaviconConfig | null | undefined): string | undefined {
+  if (!cfg) return undefined;
+  return pick(cfg.basePath, cfg.base_path);
+}
+
+export function getFaviconSkipDefaultLinks(cfg: RawFaviconConfig | null | undefined): boolean {
+  if (!cfg) return false;
+  return pick(cfg.skipDefaultLinks, cfg.skip_default_links) === true;
+}
+
+export function getFaviconLinksHtml(cfg: RawFaviconConfig | null | undefined): string | undefined {
+  if (!cfg) return undefined;
+  return pick(cfg.linksHtml, cfg.links_html);
+}
+
+export function getFaviconSourceDir(cfg: RawFaviconConfig | null | undefined): string | undefined {
+  if (!cfg) return undefined;
+  return pick(cfg.sourceDir, cfg.source_dir);
+}
+
+export function getFaviconIcons(cfg: RawFaviconConfig | null | undefined): unknown {
+  if (!cfg) return undefined;
+  // `icons` has no snake_case form — same key in both worlds.
+  return cfg.icons;
+}