shelving 1.222.1 → 1.222.2

package/extract/MarkupExtractor.d.ts

@@ -2,9 +2,11 @@ import { type FileElementProps } from "../util/element.js";
 import { FileExtractor } from "./FileExtractor.js";
 /**
  * File extractor for Markdown files.
- * - Stores the raw markdown text as `content`; rendering happens at output time via `<Markup>`.
+ * - Stores the markdown text as `content`; rendering happens at output time via `<Markup>`.
  * - Sets `title` from the first `# h1` heading if one is present — otherwise leaves it undefined
  *   (a confident title only).
+ * - When a `title` is found, strips the leading `# h1` from `content` so renderers (which show
+ *   `title` separately) don't display the heading twice.
  * - Sets `description` to the first prose paragraph as a plain-text summary (used for card listings and `<meta>`).
  */
 export declare class MarkupExtractor extends FileExtractor {

package/extract/MarkupExtractor.js

@@ -3,9 +3,11 @@ import { getElementText, walkElements } from "../util/element.js";
 import { FileExtractor } from "./FileExtractor.js";
 /**
  * File extractor for Markdown files.
- * - Stores the raw markdown text as `content`; rendering happens at output time via `<Markup>`.
+ * - Stores the markdown text as `content`; rendering happens at output time via `<Markup>`.
  * - Sets `title` from the first `# h1` heading if one is present — otherwise leaves it undefined
  *   (a confident title only).
+ * - When a `title` is found, strips the leading `# h1` from `content` so renderers (which show
+ *   `title` separately) don't display the heading twice.
  * - Sets `description` to the first prose paragraph as a plain-text summary (used for card listings and `<meta>`).
  */
 export class MarkupExtractor extends FileExtractor {
@@ -13,7 +15,8 @@ export class MarkupExtractor extends FileExtractor {
     priority = 10;
     extractProps(name, text) {
         const { title, description } = extractMarkdownProps(text);
-        return { name, title, description, content: text };
+        // The title `# h1` is surfaced separately as `title`, so strip it from the body to avoid rendering it twice.
+        return { name, title, description, content: title ? _stripTitle(text) : text };
     }
 }
 /**
@@ -43,3 +46,7 @@ export function extractMarkdownProps(text) {
 function _plain(element) {
     return getElementText(element).replace(/\s+/g, " ").trim() || undefined;
 }
+/** Strip a leading `# h1` heading (and any blank lines after it) from markdown text. */
+function _stripTitle(text) {
+    return text.replace(/^\s*#[^\n\S]+\S[^\n]*(?:\n+|$)/, "");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "shelving",
-	"version": "1.222.1",
+	"version": "1.222.2",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"repository": {
 		"type": "git",

package/ui/docs/DirectoryPage.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Prose } from "../block/Prose.js";
+import { Title } from "../block/Title.js";
 import { Markup } from "../misc/Markup.js";
 import { requireMeta } from "../misc/MetaContext.js";
 import { Page } from "../page/Page.js";
@@ -8,5 +9,5 @@ import { TreeCards } from "../tree/TreeCards.js";
 export function DirectoryPage({ title, name, description, content, children }) {
     const { url } = requireMeta();
     const path = url?.pathname ?? "/";
-    return (_jsxs(Page, { title: title ?? name, description: description, children: [content && (_jsx(Prose, { children: _jsx(Markup, { children: content }) })), _jsx(TreeCards, { path: path, children: children })] }));
+    return (_jsxs(Page, { title: title ?? name, description: description, children: [_jsx(Title, { children: title ?? name }), content && (_jsx(Prose, { children: _jsx(Markup, { children: content }) })), _jsx(TreeCards, { path: path, children: children })] }));
 }

package/ui/docs/DirectoryPage.tsx

@@ -1,6 +1,7 @@
 import type { ReactNode } from "react";
 import type { DirectoryElementProps } from "../../util/element.js";
 import { Prose } from "../block/Prose.js";
+import { Title } from "../block/Title.js";
 import { Markup } from "../misc/Markup.js";
 import { requireMeta } from "../misc/MetaContext.js";
 import { Page } from "../page/Page.js";
@@ -12,6 +13,7 @@ export function DirectoryPage({ title, name, description, content, children }: D
 	const path = url?.pathname ?? "/";
 	return (
 		<Page title={title ?? name} description={description}>
+			<Title>{title ?? name}</Title>
 			{content && (
 				<Prose>
 					<Markup>{content}</Markup>

package/ui/docs/FilePage.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Prose } from "../block/Prose.js";
+import { Title } from "../block/Title.js";
 import { Markup } from "../misc/Markup.js";
 import { requireMeta } from "../misc/MetaContext.js";
 import { Page } from "../page/Page.js";
@@ -8,5 +9,5 @@ import { TreeCards } from "../tree/TreeCards.js";
 export function FilePage({ title, name, description, content, children }) {
     const { url } = requireMeta();
     const path = url?.pathname ?? "/";
-    return (_jsxs(Page, { title: title ?? name, description: description, children: [content && (_jsx(Prose, { children: _jsx(Markup, { children: content }) })), _jsx(TreeCards, { path: path, children: children })] }));
+    return (_jsxs(Page, { title: title ?? name, description: description, children: [_jsx(Title, { children: title ?? name }), content && (_jsx(Prose, { children: _jsx(Markup, { children: content }) })), _jsx(TreeCards, { path: path, children: children })] }));
 }

package/ui/docs/FilePage.tsx

@@ -1,6 +1,7 @@
 import type { ReactNode } from "react";
 import type { FileElementProps } from "../../util/element.js";
 import { Prose } from "../block/Prose.js";
+import { Title } from "../block/Title.js";
 import { Markup } from "../misc/Markup.js";
 import { requireMeta } from "../misc/MetaContext.js";
 import { Page } from "../page/Page.js";
@@ -12,6 +13,7 @@ export function FilePage({ title, name, description, content, children }: FileEl
 	const path = url?.pathname ?? "/";
 	return (
 		<Page title={title ?? name} description={description}>
+			<Title>{title ?? name}</Title>
 			{content && (
 				<Prose>
 					<Markup>{content}</Markup>

package/util/element.d.ts

@@ -41,7 +41,7 @@ export interface TreeElementProps extends ElementProps {
     /**
      * Markup source string that should be rendered as the element's visible body content.
      * - Rendered via the `<Markup>` component (typically inside a `<Prose>` wrapper).
-     * - For Markdown files this is the file's text; for TypeScript symbols this is the JSDoc description.
+     * - For Markdown files this is the file's body (the title `# h1` is lifted into `title`); for TypeScript symbols this is the JSDoc description.
      */
     readonly content?: string | undefined;
     /** Children of a tree element must be other tree elements. */