blume 0.6.7 → 0.7.0

package/src/components/layout/PageLayout.astro

@@ -25,6 +25,7 @@ import type {
 import { EN_UI } from "../../core/i18n-ui.ts";
 import type { UIStrings } from "../../core/i18n-ui.ts";
 import type { LocaleSwitchOption, Navigation } from "../../core/types.ts";
+import { withBase } from "../islands/base-path.ts";
 import "blume:theme";
 import Analytics from "./Analytics.astro";
 import Banner from "./Banner.astro";
@@ -121,18 +122,22 @@ const route = page?.route ?? "/";
 // (`/og/<slug>.png`, `index` for the home) is generated for static custom pages
 // when `og.enabled`. Explicit props still win.
 const ogSlug = route === "/" ? "index" : route.slice(1);
+// Absolute URLs carry the deployment base too (`site + base + route`), since the
+// page is served under it. `withBase` handles a root base as a no-op.
+const basedRoute = withBase(route);
 const resolvedCanonical =
-  canonical ?? (siteUrl ? `${siteUrl}${route === "/" ? "" : route}` : null);
+  canonical ??
+  (siteUrl ? `${siteUrl}${basedRoute === "/" ? "" : basedRoute}` : null);
 // An explicit `ogImage` wins. A root-relative path (e.g. an image dropped in
 // `public/`) is resolved against the site URL so crawlers get an absolute
 // `og:image`; an already-absolute URL passes through untouched. Otherwise fall
 // back to the generated OG card for this route.
 const absolutizeOgImage = (value: string): string =>
-  value.startsWith("/") && siteUrl ? `${siteUrl}${value}` : value;
+  value.startsWith("/") && siteUrl ? `${siteUrl}${withBase(value)}` : value;
 const resolvedOgImage = ogImage
   ? absolutizeOgImage(ogImage)
   : ogEnabled && siteUrl
-    ? `${siteUrl}/og/${ogSlug}.png`
+    ? `${siteUrl}${withBase(`/og/${ogSlug}.png`)}`
     : null;
 
 const initialThemeScript = themeInitScript(themeMode);
@@ -215,7 +220,7 @@ const bannerScript = banner?.dismissible
                           : undefined
                       }
                       class="block rounded-[0.65rem] px-2.5 py-1.5 font-medium text-muted-foreground text-sm transition-colors hover:bg-muted hover:text-foreground aria-[current=page]:bg-muted aria-[current=page]:text-foreground"
-                      href={tab.path}
+                      href={withBase(tab.path)}
                     >
                       {tab.label}
                     </a>

package/src/components/layout/Pagination.astro

@@ -1,4 +1,5 @@
 ---
+import { withBase } from "../islands/base-path.ts";
 import type { UIStrings } from "../../core/i18n-ui.ts";
 import type { FlatPage } from "./nav-utils.ts";
 import Icon from "../Icon.astro";
@@ -24,7 +25,7 @@ const { prev, next, strings } = Astro.props;
       {prev ? (
         <a
           class="flex max-w-[48%] flex-1 items-center gap-2 rounded-full border border-border px-4 py-3 text-foreground transition-colors hover:border-foreground max-md:max-w-full"
-          href={prev.route}
+          href={withBase(prev.route)}
         >
           <Icon class="rtl:-scale-x-100" name="arrow-left" size={16} />
           <span>
@@ -40,7 +41,7 @@ const { prev, next, strings } = Astro.props;
       {next && (
         <a
           class="ms-auto flex max-w-[48%] flex-1 items-center justify-end gap-2 rounded-full border border-border px-4 py-3 text-end text-foreground transition-colors hover:border-foreground max-md:max-w-full"
-          href={next.route}
+          href={withBase(next.route)}
         >
           <span>
             <span class="block text-muted-foreground text-xs max-md:hidden">

package/src/components/layout/RootLayout.astro

@@ -10,6 +10,7 @@ import type {
 import "blume:theme";
 import type { ComponentOverride } from "../../core/define-components.ts";
 import { buildStructuredData } from "../../seo/jsonld.ts";
+import { withBase } from "../islands/base-path.ts";
 import Analytics from "./Analytics.astro";
 import Banner from "./Banner.astro";
 import Breadcrumbs from "./Breadcrumbs.astro";
@@ -250,7 +251,8 @@ const formattedLastModified =
 
 // The hosted MCP server's absolute URL, used by the page-actions install menu.
 // Needs a configured site to be useful, so the menu is hidden without one.
-const mcpUrl = mcp && siteUrl ? new URL(mcp.route, siteUrl).href : null;
+const mcpUrl =
+  mcp && siteUrl ? new URL(withBase(mcp.route), siteUrl).href : null;
 
 // Scope the sidebar (and the breadcrumbs/pagination derived from it) to the
 // active tab's section, so a multi-section site drills each tab into its own
@@ -266,6 +268,7 @@ const structuredData =
   structuredDataEnabled === false || noindex
     ? null
     : buildStructuredData({
+      base: import.meta.env.BASE_URL,
       breadcrumbs: crumbs,
       description,
       locale,
@@ -318,7 +321,7 @@ const bannerScript = banner?.dismissible
     {
       feeds?.map((feed) => (
         <link
-          href={feed.href}
+          href={withBase(feed.href)}
           rel="alternate"
           title={feed.title}
           type="application/rss+xml"
@@ -390,7 +393,7 @@ const bannerScript = banner?.dismissible
                     <li>
                       <a
                         class="block rounded-[0.65rem] px-2.5 py-1.5 text-muted-foreground text-sm transition-colors hover:bg-muted hover:text-foreground"
-                        href={link.href}
+                        href={withBase(link.href)}
                         rel={external ? "noreferrer" : undefined}
                         target={external ? "_blank" : undefined}
                       >
@@ -445,7 +448,7 @@ const bannerScript = banner?.dismissible
                           : undefined
                       }
                       class="block rounded-[0.65rem] px-2.5 py-1.5 font-medium text-muted-foreground text-sm transition-colors hover:bg-muted hover:text-foreground aria-[current=page]:bg-muted aria-[current=page]:text-foreground"
-                      href={tab.path}
+                      href={withBase(tab.path)}
                     >
                       {tab.label}
                     </a>

package/src/components/layout/Search.astro

@@ -19,7 +19,10 @@ interface Props {
 }
 
 const { askEnabled = false, navigation, strings, locale } = Astro.props;
-const s = strings ?? EN_UI.search;
+// Merge over the English baseline per key (rather than `strings ?? …`) so a
+// partial — or empty `{}` — strings object still resolves every label to a
+// default, matching the pattern PageActions uses for its own dictionary.
+const s = { ...EN_UI.search, ...strings };
 
 // Pages shown in the empty state, before the user has typed anything.
 const popular = navigation ? flattenPages(navigation.sidebar).slice(0, 6) : [];
@@ -139,6 +142,7 @@ const kbd = "rounded border border-border bg-muted px-1 py-0.5 font-mono";
 
   <script>
     import { chromeIcons as icons } from "../../theme/chrome-icons.ts";
+    import { prefixBase } from "../islands/base-path.ts";
     import {
       escapeHtml,
       highlight,
@@ -475,7 +479,10 @@ const kbd = "rounded border border-border bg-muted px-1 py-0.5 font-mono";
 
       createHitRow(hit: SearchHit, query: string): Selectable {
         const el = document.createElement("a");
-        el.href = hit.url;
+        // Index URLs are base-less logical routes; prefix the deployment base so
+        // clicking a result lands on the page's real served URL.
+        const href = prefixBase(import.meta.env.BASE_URL, hit.url);
+        el.href = href;
         el.className = `${ROW_CLASS} ${MARK}`;
         // `line-clamp-2` already sets `display`, so no `block` here (it would
         // override the clamp and let the excerpt run to full height).
@@ -488,21 +495,22 @@ const kbd = "rounded border border-border bg-muted px-1 py-0.5 font-mono";
             <span class="block truncate font-normal text-foreground text-sm">${hit.title}</span>
             ${excerpt}
           </span>`;
-        const item: Selectable = { el, hit, kind: "link", url: hit.url };
+        const item: Selectable = { el, hit, kind: "link", url: href };
         this.bindRow(item);
         return item;
       }
 
       createLinkRow(url: string, label: string): Selectable {
         const el = document.createElement("a");
-        el.href = url;
+        const href = prefixBase(import.meta.env.BASE_URL, url);
+        el.href = href;
         el.className = ROW_CLASS;
         el.innerHTML = `
           <span class="mt-0.5 shrink-0 text-muted-foreground">${svg("file")}</span>
           <span class="flex-1">
             <span class="block truncate font-normal text-foreground text-sm">${escapeHtml(label)}</span>
           </span>`;
-        const item: Selectable = { el, kind: "link", url };
+        const item: Selectable = { el, kind: "link", url: href };
         this.bindRow(item);
         return item;
       }

package/src/components/layout/nav-utils.ts

@@ -119,10 +119,14 @@ const sectionChildren = (nodes: NavNode[], base: string): NavNode[] | null => {
 };
 
 /** Whether a group maps to a header tab (matched on its path or link route). */
-const isTabSection = (node: NavNode, tabPaths: Set<string>): boolean =>
-  node.kind === "group" &&
-  ((node.path !== undefined && tabPaths.has(node.path)) ||
-    (node.route !== undefined && tabPaths.has(node.route)));
+const isTabSection = (node: NavNode, tabPaths: Set<string>): boolean => {
+  if (node.kind !== "group") {
+    return false;
+  }
+  const byPath = node.path !== undefined && tabPaths.has(node.path);
+  const byRoute = node.route !== undefined && tabPaths.has(node.route);
+  return byPath || byRoute;
+};
 
 /**
  * Drop the groups that already own a header tab from the tree, at any depth —
@@ -132,9 +136,12 @@ const isTabSection = (node: NavNode, tabPaths: Set<string>): boolean =>
  * (`/`) spans everything, so it never removes anything.
  */
 const withoutTabSections = (nodes: NavNode[], tabs: NavTab[]): NavNode[] => {
-  const tabPaths = new Set(
-    tabs.filter((tab) => tab.path !== "/").map((tab) => tab.path)
-  );
+  const tabPaths = new Set<string>();
+  for (const tab of tabs) {
+    if (tab.path !== "/") {
+      tabPaths.add(tab.path);
+    }
+  }
   if (tabPaths.size === 0) {
     return nodes;
   }
@@ -145,11 +152,12 @@ const withoutTabSections = (nodes: NavNode[], tabs: NavTab[]): NavNode[] => {
         continue;
       }
       if (item.kind === "group") {
+        // A container left empty by pruning is dropped, so no bare heading is
+        // stranded.
         const children = prune(item.children);
-        if (children.length === 0) {
-          continue;
+        if (children.length > 0) {
+          kept.push({ ...item, children });
         }
-        kept.push({ ...item, children });
       } else {
         kept.push(item);
       }

package/src/components/layout/search/pagefind.ts

@@ -21,6 +21,9 @@ interface PagefindModule {
 export const createSearch = async (opts: {
   url: string;
 }): Promise<SearchFn> => {
+  // The pagefind bundle lives in the built site (not node_modules) and is
+  // resolved at runtime by URL — it can't be a static, code-splittable path.
+  // oxlint-disable-next-line react-doctor/no-dynamic-import-path
   const pagefind = (await import(
     /* @vite-ignore */
     opts.url

package/src/components/layout/toc-element.ts

@@ -52,7 +52,13 @@ class BlumeToc extends HTMLElement {
     for (const { heading } of this.#entries) {
       this.#observer.observe(heading);
     }
-    window.addEventListener("scroll", this.#onScroll, { passive: true });
+    // The scroll listener is the intentional fallback for the one case the
+    // IntersectionObserver can't cover (a final section too short to push its
+    // heading past the trigger line), so replacing it with an observer would
+    // change behavior. `scroll` isn't cancelable, so it never preventDefaults
+    // and `{ passive: true }` would be a no-op here.
+    // oxlint-disable-next-line github/prefer-observers, react-doctor/client-passive-event-listeners
+    window.addEventListener("scroll", this.#onScroll);
     this.#update();
   }
 

package/src/components/openapi/RequestPanel.astro

@@ -1,4 +1,6 @@
 ---
+import data from "blume:data";
+
 import { highlightCode } from "../../markdown/index.ts";
 import { exampleValue, type SchemaLike, toJson } from "./helpers.ts";
 import type { RequestSample, SampleLanguage } from "./snippets.ts";
@@ -35,6 +37,7 @@ const requestSamples = await Promise.all(
   languages.map(async (language) => ({
     html: await highlightCode(language.build(sample), language.lang, {
       icons: false,
+      themes: data.config.codeThemes,
     }),
     id: language.id,
     label: language.label,
@@ -53,7 +56,10 @@ const responseEntries = await Promise.all(
     const html =
       example === undefined || example === null
         ? null
-        : await highlightCode(toJson(example), "json", { icons: false });
+        : await highlightCode(toJson(example), "json", {
+            icons: false,
+            themes: data.config.codeThemes,
+          });
     return { description: response.description ?? "", html, status };
   })
 );

package/src/components/openapi/snippets.ts

@@ -43,6 +43,26 @@ const jsonContentType = (
   return entries.find(([type]) => type.includes("json")) ?? entries[0];
 };
 
+/** The `?a=1&b=2` query string from an operation's required query params. */
+const queryString = (
+  params: ParamLike[],
+  schemas: Record<string, SchemaLike>
+): string => {
+  const query: string[] = [];
+  for (const param of params) {
+    if (!(param.in === "query" && param.required && param.name)) {
+      continue;
+    }
+    const value = param.example ?? exampleValue(param.schema, schemas);
+    query.push(
+      `${encodeURIComponent(param.name)}=${encodeURIComponent(
+        String(value ?? "")
+      )}`
+    );
+  }
+  return query.length > 0 ? `?${query.join("&")}` : "";
+};
+
 /** Assemble a representative request from an operation and the spec servers. */
 export const buildRequestSample = (
   operation: OperationLike,
@@ -65,15 +85,7 @@ export const buildRequestSample = (
     }
   }
 
-  const query = params
-    .filter((param) => param.in === "query" && param.required && param.name)
-    .map((param) => {
-      const value = param.example ?? exampleValue(param.schema, schemas);
-      return `${encodeURIComponent(param.name ?? "")}=${encodeURIComponent(
-        String(value ?? "")
-      )}`;
-    });
-  const search = query.length > 0 ? `?${query.join("&")}` : "";
+  const search = queryString(params, schemas);
 
   const headers: Record<string, string> = {};
   for (const param of params) {
@@ -117,7 +129,8 @@ const curlSnippet = (sample: RequestSample): string => {
   if (sample.body) {
     // Close-quote/escaped-quote/reopen: the POSIX way to put a literal ' in a
     // single-quoted string, so an example like "it's" doesn't break the shell.
-    lines.push(`  -d '${sample.body.replaceAll("'", String.raw`'\''`)}'`);
+    const escapedBody = sample.body.replaceAll("'", String.raw`'\''`);
+    lines.push(`  -d '${escapedBody}'`);
   }
   return lines.join(" \\\n");
 };
@@ -200,11 +213,12 @@ const ALIASES: Record<string, string> = {
 /** The sample languages to render, resolved from config ids (unknown ids dropped). */
 export const sampleLanguages = (ids: string[]): SampleLanguage[] => {
   const wanted = ids.length > 0 ? ids : ["curl", "js", "python"];
+  const byId = new Map(LANGUAGES.map((entry) => [entry.id, entry]));
   const out: SampleLanguage[] = [];
   const seen = new Set<string>();
   for (const raw of wanted) {
     const id = ALIASES[raw.toLowerCase()] ?? raw.toLowerCase();
-    const language = LANGUAGES.find((entry) => entry.id === id);
+    const language = byId.get(id);
     if (language && !seen.has(id)) {
       seen.add(id);
       out.push(language);

package/src/core/base-path.ts

@@ -0,0 +1,70 @@
+/**
+ * The site-wide `basePath` — a mount point that prepends a segment to every
+ * generated route (`/docs/getting-started`) while staying invisible to the
+ * navigation tree (see `core/navigation.ts`, which builds groups from a page's
+ * base-less `navPath` and takes URLs from its based `route`). This is distinct
+ * from a per-source `prefix` (a namespace that *does* create a sidebar group)
+ * and from `deployment.base` (Astro's host-subdirectory base); the two compose,
+ * stacking as `{deployment.base}/{basePath}/page`.
+ *
+ * These helpers run server-side (config, route construction, the link checker,
+ * redirects, the markdown link plugin). The client-side counterpart lives in
+ * `components/islands/base-path.ts` and serves `deployment.base` via `BASE_URL`.
+ */
+
+/**
+ * Canonicalize a configured base path to either `""` (none) or `/seg[/seg…]`
+ * (leading slash, no trailing slash, collapsed inner slashes). A blank value or
+ * bare `/` normalizes to `""`, so an unset/`"/"` base is a clean no-op.
+ */
+export const normalizeBasePath = (input?: string): string => {
+  if (!input) {
+    return "";
+  }
+  const trimmed = input
+    .trim()
+    .replaceAll(/^\/+|\/+$/gu, "")
+    .replaceAll(/\/{2,}/gu, "/");
+  return trimmed === "" ? "" : `/${trimmed}`;
+};
+
+/**
+ * Whether a link target is a root-relative internal path (`/x`) — the only
+ * shape a base path applies to. Protocol-relative (`//host`), absolute URLs,
+ * other schemes (`mailto:`), fragments (`#x`), and relative paths are excluded.
+ */
+export const isInternalPath = (target: string): boolean =>
+  target.startsWith("/") && !target.startsWith("//");
+
+/**
+ * Idempotently prepend `basePath` to a root-relative route. A route already
+ * equal to or nested under the base is returned unchanged, so authors who write
+ * the base by hand (`/docs/x`) aren't double-prefixed to `/docs/docs/x`.
+ */
+export const withBasePath = (basePath: string, route: string): string => {
+  if (!basePath || !isInternalPath(route)) {
+    return route;
+  }
+  if (route === basePath || route.startsWith(`${basePath}/`)) {
+    return route;
+  }
+  return route === "/" ? basePath : `${basePath}${route}`;
+};
+
+/**
+ * Remove `basePath` from the front of a route (`/docs/guide` -> `/guide`,
+ * `/docs` -> `/`). A route not under the base is returned unchanged. Inverse of
+ * {@link withBasePath}; used to resolve public assets, which live at the site
+ * root regardless of the base.
+ */
+export const stripBasePath = (basePath: string, route: string): string => {
+  if (!basePath) {
+    return route;
+  }
+  if (route === basePath) {
+    return "/";
+  }
+  return route.startsWith(`${basePath}/`)
+    ? route.slice(basePath.length)
+    : route;
+};

package/src/core/component-overrides.ts

@@ -62,6 +62,7 @@ export interface ComponentOverrideAnalysis {
 }
 
 const GROUPS = ["mdx", "layout", "islands"] as const;
+const GROUP_SET = new Set<string>(GROUPS);
 type Group = (typeof GROUPS)[number];
 
 const FRAMEWORK_BY_EXT: Record<string, OverrideFramework> = {
@@ -121,35 +122,43 @@ const emptyAnalysis = (): ComponentOverrideAnalysis => ({
 const propName = (name: ts.PropertyName): string | undefined =>
   ts.isIdentifier(name) || ts.isStringLiteral(name) ? name.text : undefined;
 
+/** Record the bindings declared by one import statement into `map`. */
+const addImportBindings = (
+  map: Map<string, ImportBinding>,
+  statement: ts.Statement
+): void => {
+  if (
+    !ts.isImportDeclaration(statement) ||
+    !ts.isStringLiteral(statement.moduleSpecifier)
+  ) {
+    return;
+  }
+  const specifier = statement.moduleSpecifier.text;
+  const clause = statement.importClause;
+  if (!clause) {
+    return;
+  }
+  if (clause.name) {
+    map.set(clause.name.text, { imported: "default", specifier });
+  }
+  const named = clause.namedBindings;
+  if (named && ts.isNamedImports(named)) {
+    for (const element of named.elements) {
+      map.set(element.name.text, {
+        imported: (element.propertyName ?? element.name).text,
+        specifier,
+      });
+    }
+  }
+};
+
 /** Map each local binding name to the module + exported name it came from. */
 const collectImports = (
   sourceFile: ts.SourceFile
 ): Map<string, ImportBinding> => {
   const map = new Map<string, ImportBinding>();
   for (const statement of sourceFile.statements) {
-    if (
-      !ts.isImportDeclaration(statement) ||
-      !ts.isStringLiteral(statement.moduleSpecifier)
-    ) {
-      continue;
-    }
-    const specifier = statement.moduleSpecifier.text;
-    const clause = statement.importClause;
-    if (!clause) {
-      continue;
-    }
-    if (clause.name) {
-      map.set(clause.name.text, { imported: "default", specifier });
-    }
-    const named = clause.namedBindings;
-    if (named && ts.isNamedImports(named)) {
-      for (const element of named.elements) {
-        map.set(element.name.text, {
-          imported: (element.propertyName ?? element.name).text,
-          specifier,
-        });
-      }
-    }
+    addImportBindings(map, statement);
   }
   return map;
 };
@@ -232,6 +241,43 @@ const resolveIdentifier = (
   return binding ? toImport(binding.specifier, binding.imported, dir) : null;
 };
 
+/** Fold one descriptor-object property into the accumulating descriptor. */
+const applyDescriptorProperty = (
+  descriptor: RawDescriptor,
+  property: ts.ObjectLiteralElementLike,
+  imports: Map<string, ImportBinding>,
+  dir: string
+): void => {
+  if (ts.isShorthandPropertyAssignment(property)) {
+    if (property.name.text === "component") {
+      descriptor.hadComponent = true;
+      descriptor.source = resolveIdentifier(property.name.text, imports, dir);
+    }
+    return;
+  }
+  if (!ts.isPropertyAssignment(property)) {
+    return;
+  }
+  const name = propName(property.name);
+  const init = property.initializer;
+  if (name === "component") {
+    descriptor.hadComponent = true;
+    if (ts.isStringLiteral(init)) {
+      descriptor.source = toImport(init.text, "default", dir);
+    } else if (ts.isIdentifier(init)) {
+      descriptor.source = resolveIdentifier(init.text, imports, dir);
+    }
+  } else if (
+    name === "client" &&
+    ts.isStringLiteral(init) &&
+    HYDRATION_MODES.has(init.text as HydrationMode)
+  ) {
+    descriptor.client = init.text as HydrationMode;
+  } else if (name === "media" && ts.isStringLiteral(init)) {
+    descriptor.media = init.text;
+  }
+};
+
 const readDescriptor = (
   object: ts.ObjectLiteralExpression,
   imports: Map<string, ImportBinding>,
@@ -239,34 +285,7 @@ const readDescriptor = (
 ): RawDescriptor => {
   const descriptor: RawDescriptor = { hadComponent: false, source: null };
   for (const property of object.properties) {
-    if (ts.isShorthandPropertyAssignment(property)) {
-      if (property.name.text === "component") {
-        descriptor.hadComponent = true;
-        descriptor.source = resolveIdentifier(property.name.text, imports, dir);
-      }
-      continue;
-    }
-    if (!ts.isPropertyAssignment(property)) {
-      continue;
-    }
-    const name = propName(property.name);
-    const init = property.initializer;
-    if (name === "component") {
-      descriptor.hadComponent = true;
-      if (ts.isStringLiteral(init)) {
-        descriptor.source = toImport(init.text, "default", dir);
-      } else if (ts.isIdentifier(init)) {
-        descriptor.source = resolveIdentifier(init.text, imports, dir);
-      }
-    } else if (
-      name === "client" &&
-      ts.isStringLiteral(init) &&
-      HYDRATION_MODES.has(init.text as HydrationMode)
-    ) {
-      descriptor.client = init.text as HydrationMode;
-    } else if (name === "media" && ts.isStringLiteral(init)) {
-      descriptor.media = init.text;
-    }
+    applyDescriptorProperty(descriptor, property, imports, dir);
   }
   return descriptor;
 };
@@ -422,6 +441,38 @@ const normalizeEntry = (
   return { identifier: false, key, source: null };
 };
 
+/** Normalize one top-level `{ mdx | layout | islands }` group into `result`. */
+const collectGroupOverrides = (
+  property: ts.ObjectLiteralElementLike,
+  imports: Map<string, ImportBinding>,
+  dir: string,
+  result: ComponentOverrideAnalysis
+): void => {
+  if (!ts.isPropertyAssignment(property)) {
+    return;
+  }
+  const name = propName(property.name);
+  if (
+    !(name && GROUP_SET.has(name)) ||
+    !ts.isObjectLiteralExpression(property.initializer)
+  ) {
+    return;
+  }
+  const group = name as Group;
+  for (const entry of property.initializer.properties) {
+    const normalized = normalizeEntry(
+      entry,
+      group,
+      imports,
+      dir,
+      result.warnings
+    );
+    if (normalized) {
+      result[group].push(normalized);
+    }
+  }
+};
+
 /**
  * Parse a user `components.ts`/`.tsx` and return its normalized overrides. Never
  * executes the file. On a parse failure or unrecognized shape, returns empty
@@ -449,29 +500,7 @@ export const analyzeComponentOverrides = (
   const dir = dirname(filePath);
 
   for (const property of object.properties) {
-    if (!ts.isPropertyAssignment(property)) {
-      continue;
-    }
-    const name = propName(property.name);
-    if (
-      !(name && (GROUPS as readonly string[]).includes(name)) ||
-      !ts.isObjectLiteralExpression(property.initializer)
-    ) {
-      continue;
-    }
-    const group = name as Group;
-    for (const entry of property.initializer.properties) {
-      const normalized = normalizeEntry(
-        entry,
-        group,
-        imports,
-        dir,
-        result.warnings
-      );
-      if (normalized) {
-        result[group].push(normalized);
-      }
-    }
+    collectGroupOverrides(property, imports, dir, result);
   }
 
   return result;