nnw-theme 2.2.0 → 2.4.0

package/assets/netnewswire/Shared/core.css

@@ -63,6 +63,30 @@ img.twemoji, img.emoji {
 	width: auto;
 }
 
+/* Enclosures: audio and video players and images after the article body */
+
+.nnw-enclosures {
+	margin-top: 1.5em;
+}
+
+.nnw-enclosure {
+	margin: 1em 0;
+}
+
+.nnw-enclosure audio {
+	width: 100%;
+}
+
+.nnw-enclosure video,
+.nnw-enclosure img {
+	height: auto;
+}
+
+.nnw-enclosure-caption {
+	margin: 0.5em 0 0;
+	font-size: 0.9em;
+}
+
 /* Hide the external link at the bottom of Daring Fireball posts */
 
 .x-netnewswire-hide {
@@ -128,25 +152,19 @@ img[src*="/img/social/"] {
 	position: absolute;
 	display: block;
 	padding: 0em 1em;
-	margin: 1em auto;
+	margin: 1em 0;
 	top: 0.75em;
 	max-width: 44em;
 	border-radius: 0.3em;
 	box-sizing: border-box;
 }
 
-.newsfoot-footnote-popover {
-	left: calc(-1 * (50vw - 1em));
-	right: calc(-1 * (50vw - 1em));
-}
-
 .newsfoot-footnote-popover-arrow {
 	content: '';
 	display: block;
 	width: 1em;
 	position: absolute;
 	top: -0.5em;
-	left: calc(50% - 0.5em);
 	height: 1em !important;
 	transform: rotate(45deg);
 	z-index:0;

package/assets/netnewswire/Shared/main.js

@@ -69,12 +69,23 @@ function constrainBodyRelativeIframes() {
 	}
 }
 
+// An image served from the timeline’s copy falls back to its original URL when the copy can’t be loaded.
+// Registered at document start, and capturing, since error events don’t bubble.
+document.addEventListener("error", event => {
+	const element = event.target;
+	if (element instanceof HTMLImageElement && element.hasAttribute("data-nnw-src")) {
+		const originalSrc = element.getAttribute("data-nnw-src");
+		element.removeAttribute("data-nnw-src");
+		element.src = originalSrc;
+	}
+}, true);
+
 // Convert all Feedbin proxy images to be used as src, otherwise change image locations to be absolute if not already
 function convertImgSrc() {
 	document.querySelectorAll("img").forEach(element => {
 		if (element.hasAttribute("data-canonical-src")) {
 			element.src = element.getAttribute("data-canonical-src")
-		} else if (!/^[a-z]+\:\/\//i.test(element.src)) {
+		} else if (!element.hasAttribute("data-nnw-src") && !/^[a-z]+\:\/\//i.test(element.src)) {
 			element.src = new URL(element.src, document.baseURI).href;
 		}
 	});
@@ -169,6 +180,67 @@ function stopMediaPlayback() {
 	});
 }
 
+// The element at the top of the viewport, how far through it the viewport top is,
+// and any remaining distance. A scroll offset alone means nothing once the article
+// reflows at a different width.
+let scrollAnchorElement = null;
+let scrollAnchorFraction = 0;
+let scrollAnchorOffset = 0;
+
+const scrollAnchorSampleSpacing = 16;
+
+// False for a container hit in the gap between blocks: it has element children
+// and only whitespace text of its own.
+function isScrollAnchorCandidate(element) {
+	if (element.children.length === 0) {
+		return true;
+	}
+	for (const node of element.childNodes) {
+		if (node.nodeType === Node.TEXT_NODE && node.textContent.trim() !== "") {
+			return true;
+		}
+	}
+	return false;
+}
+
+function findScrollAnchorElement() {
+	const x = window.innerWidth / 2;
+	const maximumSampleDepth = window.innerHeight / 4;
+	let firstHit = null;
+	for (let y = 1; y <= maximumSampleDepth; y += scrollAnchorSampleSpacing) {
+		const element = document.elementFromPoint(x, y);
+		if (!element) {
+			continue;
+		}
+		if (isScrollAnchorCandidate(element)) {
+			return element;
+		}
+		if (!firstHit) {
+			firstHit = element;
+		}
+	}
+	return firstHit;
+}
+
+function recordScrollAnchor() {
+	scrollAnchorElement = findScrollAnchorElement();
+	if (!scrollAnchorElement) {
+		return;
+	}
+	const rect = scrollAnchorElement.getBoundingClientRect();
+	scrollAnchorFraction = rect.height > 0 ? Math.min(Math.max(-rect.top / rect.height, 0), 1) : 0;
+	scrollAnchorOffset = -(rect.top + scrollAnchorFraction * rect.height);
+}
+
+// Scrolls back to the same place in the recorded element after a reflow.
+function restoreScrollAnchor() {
+	if (!scrollAnchorElement || !scrollAnchorElement.isConnected) {
+		return;
+	}
+	const rect = scrollAnchorElement.getBoundingClientRect();
+	window.scrollTo(0, window.scrollY + rect.top + scrollAnchorFraction * rect.height + scrollAnchorOffset);
+}
+
 function error() {
 	document.body.innerHTML = "error";
 }

package/assets/netnewswire/Shared/newsfoot.js

@@ -15,17 +15,6 @@
 		return el;
 	}
 
-	/** @type {<T extends any[]>(fn: (...args: T) => void, t: number) => ((...args: T) => void)} */
-	function debounce(f, ms) {
-		let t = Date.now();
-		return (...args) => {
-			const now = Date.now();
-			if (now - t < ms) return;
-			t = now;
-			f(...args);
-		};
-	}
-
 	const clsPrefix = "newsfoot-footnote-";
 	const CONTAINER_CLS = `${clsPrefix}container`;
 	const POPOVER_CLS = `${clsPrefix}popover`;
@@ -76,7 +65,7 @@
 			}
 			document.addEventListener("click", this.clickoutHandler, {capture: true});
   
-			this.resizeHandler = debounce(() => this.reposition(), 20);
+			this.resizeHandler = () => this.reposition();
 			window.addEventListener("resize", this.resizeHandler);
 		}
   
@@ -92,23 +81,31 @@
   
 		reposition() {
 			const refRect = this.fnref.getBoundingClientRect();
-			const center = refRect.left + (refRect.width / 2);
-			const popoverHalfWidth = this.popover.clientWidth / 2;
-			const marginLeft = stripPx(this.style.marginLeft);
-			const marginRight = stripPx(this.style.marginRight);
+			const containerRect = this.fnref.closest(`.${CONTAINER_CLS}`).getBoundingClientRect();
+			const articleBody = this.fnref.closest(".articleBody");
+			const visibleRect = articleBody ? articleBody.getBoundingClientRect() : document.documentElement.getBoundingClientRect();
+			const maximumWidth = stripPx(this.style.maxWidth);
+			const popoverWidth = Math.min(visibleRect.width, maximumWidth);
+			const refCenter = refRect.left + (refRect.width / 2);
+			const minimumLeft = visibleRect.left;
+			const maximumLeft = visibleRect.right - popoverWidth;
+			const popoverLeft = Math.min(
+				Math.max(refCenter - (popoverWidth / 2), minimumLeft),
+				maximumLeft
+			);
 
-			const rightOverhang = center + popoverHalfWidth + marginRight > window.innerWidth;
-			const leftOverhang = center - (popoverHalfWidth + marginLeft) < 0;
+			// Keep the popover inside the visible article column while centering it on the
+			// footnote reference whenever there is enough room.
+			this.popover.style.left = `${popoverLeft - containerRect.left}px`;
+			this.popover.style.width = `${popoverWidth}px`;
 
-			let offset = 0;
-			if (leftOverhang || rightOverhang) {
-				// Popover can't be centered on the ref without overflowing the viewport.
-				// Center it horizontally in the viewport so left/right margins are balanced.
-				// The arrow gets the inverse transform below and stays anchored to the ref.
-				offset = (window.innerWidth / 2) - center;
-			}
-			this.popover.style.transform = `translate(${offset}px)`;
-			this.arrow.style.transform = `translate(${-offset}px) rotate(45deg)`;
+			const arrowWidth = this.arrow.clientWidth;
+			const arrowCenter = refCenter - popoverLeft;
+			const insetArrowCenter = Math.min(
+				Math.max(arrowCenter, arrowWidth),
+				popoverWidth - arrowWidth
+			);
+			this.arrow.style.left = `${insetArrowCenter - (arrowWidth / 2)}px`;
 		}
 	}
 

package/assets/netnewswire/iOS/main_ios.js

@@ -37,7 +37,7 @@ class ImageViewer {
 		const rect = this.img.getBoundingClientRect();
 		
 		// Instead of trying to convert to canvas (which fails with CORS),
-		// send the original image src URL
+		// send the image's src URL. Swift checks a routed timeline image's signature.
 		const message = {
 			x: rect.x,
 			y: rect.y,

package/assets/netnewswire/netnewswire.json

@@ -1,6 +1,6 @@
 {
-	"release": "mac-7.2b4",
-	"commit": "b7f4d8c7d273e4247c5d033ee47014805072297b",
+	"release": "mac-7.3b4",
+	"commit": "e530be1ab19f68fe322850bf5fb95bca4b36fb91",
 	"files": [
 		{
 			"destination": "LICENSE",
@@ -10,7 +10,7 @@
 		{
 			"destination": "Mac/main_mac.js",
 			"source": "Mac/MainWindow/Detail/main_mac.js",
-			"sha256": "3ac1ef46523f6c4d8103fe7dbe6f45486d57a94c3d54d0fcb6211a35215bb676"
+			"sha256": "51c8812b9063d70aeb9a163a224bc83954f127dfb78736b2016d6572dd9ab63f"
 		},
 		{
 			"destination": "Mac/page.html",
@@ -20,22 +20,22 @@
 		{
 			"destination": "Shared/core.css",
 			"source": "Shared/Article Rendering/core.css",
-			"sha256": "d67552259cb45261e1aacf0c1af6bc39b560b084c7b9e3943191907e0977cd4d"
+			"sha256": "1cc7d654559b3cd6db1202391c6fcfb8041eaae6fc81850df1be72ebb6921090"
 		},
 		{
 			"destination": "Shared/main.js",
 			"source": "Shared/Article Rendering/main.js",
-			"sha256": "847dc1f06ec0e7f96aee1004fd6186771db907445347cf0371abc67158aadb5a"
+			"sha256": "1c3c1084e295f83668a427b8ae89813a1df621cfb053e8192bbad3f044be3581"
 		},
 		{
 			"destination": "Shared/newsfoot.js",
 			"source": "Shared/Article Rendering/newsfoot.js",
-			"sha256": "828e6889bd976ebce417d808ac726dd9252a801946d77e32de207ba4a14e21fa"
+			"sha256": "8e0a5fd14b2b5e3b57e6d420388afa2999a8df8af56f957c16303834ad53ed61"
 		},
 		{
 			"destination": "iOS/main_ios.js",
 			"source": "iOS/Resources/main_ios.js",
-			"sha256": "e764183ea8e9ce75df13d268834741b176afdb440eb492efeaba8ccabd7dfb8b"
+			"sha256": "ab60f228e06b11589aefaac579a5ea42d1ff5ecf43aab44e2eba7679a18d6ef2"
 		},
 		{
 			"destination": "iOS/page.html",

package/dist/browser.js

@@ -10,6 +10,8 @@ import { extname, join, normalize, sep } from "node:path";
 import { packagePath, ThemeError } from "./project.js";
 import { pyReprList } from "./pyformat.js";
 const FOOTNOTE_CHECK = readFileSync(packagePath("assets", "footnotes.js"), "utf8");
+const ENCLOSURE_CHECK = readFileSync(packagePath("assets", "enclosures.js"), "utf8");
+const ENCLOSURES_MACRO = "[[enclosures]]";
 const LIVE_RELOAD = readFileSync(packagePath("assets", "live-reload.js"), "utf8");
 const NOT_INSTALLED = "WebKit is not installed; run `npx nnw-theme@2 setup`";
 const CONTENT_TYPES = {
@@ -148,6 +150,10 @@ export function failures(state) {
         found.push("article content is missing or unreadable");
     if (state.unresolved)
         found.push("unresolved theme macro");
+    if (state.literalEnclosures) {
+        found.push("[[enclosures]] shows as text in NetNewsWire releases without enclosure support; " +
+            "hide its element when it holds no .nnw-enclosures");
+    }
     if (state.overflow)
         found.push("horizontal document overflow");
     if (state.brokenImages.length)
@@ -156,6 +162,7 @@ export function failures(state) {
         found.push(`images drawn at zero size: ${pyReprList(state.collapsedImages)}`);
     if (state.unloadedImages.length)
         found.push(`images still loading: ${pyReprList(state.unloadedImages)}`);
+    found.push(...(state.enclosures ?? []));
     found.push(...(state.footnotes ?? []));
     if (state.blocked.length)
         found.push(`external requests: ${pyReprList(state.blocked)}`);
@@ -178,16 +185,19 @@ async function loadImages(timeout) {
         new Promise((resolve) => setTimeout(resolve, timeout)),
     ]);
 }
-// Runs in the page after its screenshot.
-function pageState() {
+// Runs in the page after its screenshot. With olderNetNewsWire, the template's
+// [[enclosures]] is expected in the markup and fails only if it shows as text.
+function pageState({ olderNetNewsWire, macro }) {
     const article = document.querySelector(".articleBody");
     const root = document.documentElement;
+    const html = document.body.innerHTML;
     return {
         article: Boolean(article),
         textLength: (article?.innerText || "").trim().length,
         // Body only: macOS CSS legitimately keeps the font-size macro literal. Match
         // whole macro names, so a theme script's regex such as /[[(]/ is no macro.
-        unresolved: /\[\[[A-Za-z0-9_-]+\]\]/.test(document.body.innerHTML),
+        unresolved: /\[\[[A-Za-z0-9_-]+\]\]/.test(olderNetNewsWire ? html.replaceAll(macro, "") : html),
+        literalEnclosures: olderNetNewsWire && document.body.innerText.includes(macro),
         overflow: root.scrollWidth > root.clientWidth + 1,
         brokenImages: [...document.images]
             .filter((image) => image.complete && image.naturalWidth === 0)
@@ -222,8 +232,9 @@ function pageState() {
  *
  * expectations maps a fixture name to its [expect.footnotes] table. They describe
  * the theme's own footnote handling, so they are skipped with theme scripts off.
+ * warnings, when given, receives each target's warnings by slug.
  */
-export async function checkPages(site, targets, progress, expectations = {}) {
+export async function checkPages(site, targets, progress, expectations = {}, warnings) {
     const results = {};
     const screenshots = join(site, "screenshots");
     mkdirSync(screenshots, { recursive: true });
@@ -240,6 +251,8 @@ export async function checkPages(site, targets, progress, expectations = {}) {
                 const state = await checkPage(browser, server.url, url, target, join(screenshots, `${target.slug}.png`), footnotes);
                 const found = failures(state);
                 results[target.slug] = found;
+                if (warnings)
+                    warnings[target.slug] = state.warnings ?? [];
                 progress?.finish(index, target, found);
             }
         }
@@ -284,10 +297,21 @@ async function checkPage(browser, origin, url, target, screenshot, footnotes) {
         await page.goto(url, { waitUntil: "networkidle" });
         await page.evaluate(loadImages, 10_000);
         await page.screenshot({ path: screenshot, fullPage: !target.card });
-        const state = await page.evaluate(pageState);
+        const state = await page.evaluate(pageState, {
+            olderNetNewsWire: target.olderNetNewsWire,
+            macro: ENCLOSURES_MACRO,
+        });
+        const enclosures = (await page.evaluate(`(${ENCLOSURE_CHECK})()`));
         // Last: it clicks footnotes open, so it must not disturb the screenshot.
         const found = (await page.evaluate(`(${FOOTNOTE_CHECK})(${JSON.stringify(footnotes)})`));
-        return { ...state, footnotes: found, blocked, pageErrors };
+        return {
+            ...state,
+            enclosures,
+            footnotes: found.failures,
+            warnings: found.warnings,
+            blocked,
+            pageErrors,
+        };
     }
     finally {
         await context.close();

package/dist/commands/check.js

@@ -6,14 +6,23 @@ import { interactive, openInBrowser, promptConfirm } from "../interactive.js";
 import { version } from "../main.js";
 import { buildArchive } from "../package.js";
 import { findRoot, findTheme, fixturePath, footnoteExpectations, readFixture, repositoryFixtures, ThemeError, themeStem, } from "../project.js";
-import { checkTargets, extraFixtures, renderSite, writeGallery, } from "../render.js";
+import { allFixtures, checkTargets, extraFixtures, placesEnclosures, readDeliveries, renderSite, writeGallery, } from "../render.js";
 import { staleStubs } from "../stubs.js";
 import { printWarnings } from "./package.js";
 import { CheckProgress } from "./progress.js";
+/**
+ * Each fixture's [expect.footnotes]. A fixture that models a sync service, with
+ * base_url or deliveries, fails a footnote link that never became a marker unless it
+ * sets all_converted = false; any other fixture only warns about one, unless it sets
+ * all_converted = true.
+ */
 export function expectations(root, targets) {
     const result = {};
     for (const name of new Set(targets.map((target) => target.fixture))) {
-        result[name] = footnoteExpectations(readFixture(fixturePath(root, name)), `fixtures/${name}.toml`);
+        const fixture = readFixture(fixturePath(root, name));
+        const expected = footnoteExpectations(fixture, `fixtures/${name}.toml`);
+        expected.all_converted ??= "base_url" in fixture || "deliveries" in fixture;
+        result[name] = expected;
     }
     return result;
 }
@@ -22,7 +31,7 @@ export function fixtureHint(root) {
     if (repositoryFixtures(root).length)
         return undefined;
     return ("Hint: this theme has no fixtures of its own. `npx nnw-theme@2 fixture list` " +
-        "shows ready-made ones modeled on WordPress, Ghost, Substack, and Medium markup.");
+        "shows ready-made ones modeled on WordPress, Ghost, Substack, Medium, and Mastodon markup.");
 }
 async function offerToOpen(index, choice) {
     const open = choice ?? (interactive() && (await promptConfirm("Open the preview?", true)));
@@ -34,7 +43,11 @@ export default async function check({ values }) {
     const theme = findTheme(root);
     console.log(`nnw-theme ${version()}`);
     printWarnings(staleStubs(root));
-    const targets = checkTargets(extraFixtures(root));
+    const extras = extraFixtures(root);
+    const targets = checkTargets(extras, {
+        enclosuresMacro: placesEnclosures(theme),
+        deliveries: readDeliveries(root, allFixtures(extras)),
+    });
     const expected = expectations(root, targets);
     const progress = new CheckProgress(targets.length);
     progress.status("Validating and packaging the theme…");
@@ -46,23 +59,29 @@ export default async function check({ values }) {
     progress.status(`Rendering ${targets.length} pages…`);
     const site = renderSite(root, theme, targets);
     let results;
+    const warned = {};
     try {
-        results = await checkPages(site, targets, progress, expected);
+        results = await checkPages(site, targets, progress, expected, warned);
     }
     finally {
         progress.done();
     }
     writeGallery(site, themeStem(theme), targets, results);
     const failures = targets.flatMap((target) => (results[target.slug] ?? []).map((message) => `${target.label}: ${message}`));
+    const warnings = targets.flatMap((target) => (warned[target.slug] ?? []).map((message) => `Warning: ${target.label}: ${message}`));
+    for (const warning of warnings)
+        console.log(warning);
+    const warningLines = warnings.map((warning) => `${warning}\n`).join("");
     const passed = targets.filter((target) => !results[target.slug]?.length).length;
     const packageName = basename(archive.path);
     const footer = `nnw-theme ${version()}\n`;
     const report = join(root, "build", "check-report.txt");
     if (failures.length) {
-        writeFileSync(report, `FAIL\n${failures.join("\n")}\n${footer}`, "utf8");
+        writeFileSync(report, `FAIL\n${failures.join("\n")}\n${warningLines}${footer}`, "utf8");
     }
     else {
-        writeFileSync(report, `PASS\n${targets.length} WebKit renders checked\nPackage: ${packageName}\n${footer}`, "utf8");
+        writeFileSync(report, `PASS\n${targets.length} WebKit renders checked\nPackage: ${packageName}\n` +
+            `${warningLines}${footer}`, "utf8");
         console.log(`PASS: ${targets.length} WebKit renders and ${packageName}`);
     }
     const hint = fixtureHint(root);

package/dist/commands/preview.js

@@ -3,7 +3,7 @@ import { relative, sep } from "node:path";
 import { serve } from "../browser.js";
 import { openInBrowser } from "../interactive.js";
 import { findRoot, findTheme } from "../project.js";
-import { extraFixtures, normalTargets, renderSite } from "../render.js";
+import { renderSite, repositoryTargets } from "../render.js";
 /** Whether a changed path is theme or fixture content the gallery is built from. */
 export function watched(root, path) {
     const parts = relative(root, path).split(sep);
@@ -15,7 +15,7 @@ export function watched(root, path) {
 export default async function preview({ values }) {
     const root = findRoot();
     const theme = findTheme(root);
-    const build = () => renderSite(root, theme, normalTargets(extraFixtures(root)));
+    const build = () => renderSite(root, theme, repositoryTargets(root));
     const site = build();
     const server = await serve(site, { live: true });
     console.log(`Preview: ${server.url}`);

package/dist/commands/render.js

@@ -1,9 +1,9 @@
 import { findRoot, findTheme, ThemeError } from "../project.js";
-import { extraFixtures, normalTargets, renderSite } from "../render.js";
+import { renderSite, repositoryTargets } from "../render.js";
 export default function render({ positionals }) {
     const root = findRoot();
     const theme = findTheme(root);
-    let targets = normalTargets(extraFixtures(root));
+    let targets = repositoryTargets(root);
     if (positionals.length) {
         const requested = new Set(positionals);
         targets = targets.filter((target) => requested.has(target.fixture));

package/dist/commands/screenshot.js

@@ -6,12 +6,13 @@ import { extraFixtures, FIXTURE_NAMES, RenderTarget, renderSite, } from "../rend
 import { expectations } from "./check.js";
 // Any fixture on any platform: a screenshot is a deliberate one-off, not the check matrix.
 function selectTarget(root, values) {
-    const { fixture, platform, appearance, card } = values;
+    const { fixture, platform, appearance, card, delivery } = values;
     if (![...Object.keys(FIXTURE_NAMES), ...extraFixtures(root)].includes(fixture)) {
         throw new ThemeError(`unknown fixture: ${fixture}`);
     }
     return new RenderTarget(fixture, platform, appearance, {
         card: !!card,
+        delivery: delivery,
     });
 }
 export default async function screenshot({ values }) {
@@ -19,7 +20,11 @@ export default async function screenshot({ values }) {
     const theme = findTheme(root);
     const target = selectTarget(root, values);
     const site = renderSite(root, theme, [target]);
-    const results = await checkPages(site, [target], undefined, expectations(root, [target]));
+    const warned = {};
+    const expected = expectations(root, [target]);
+    const results = await checkPages(site, [target], undefined, expected, warned);
+    for (const warning of warned[target.slug] ?? [])
+        console.log(`Warning: ${warning}`);
     const failures = results[target.slug] ?? [];
     if (failures.length) {
         throw new ThemeError(`screenshot checks failed:\n- ${failures.join("\n- ")}`);

package/dist/commands.js

@@ -1,5 +1,6 @@
 // The one description of the command line: the parser, help, and shell completion
 // are all generated from it, so they cannot drift apart.
+import { DELIVERIES } from "./delivery.js";
 export const PROGRAM = "nnw-theme";
 export const DESCRIPTION = "Create, preview, check, and publish a NetNewsWire theme.";
 export const GUIDE_TOPICS = [
@@ -18,7 +19,10 @@ export const BUILT_IN_FIXTURE_NAMES = ["article", "kitchen-sink"];
  */
 export const CATALOG_FIXTURES = {
     ghost: "Ghost cards, galleries, and lazy images",
+    mastodon: "Mastodon post: mentions, hashtags, custom emoji, image enclosures",
     medium: "Medium figures, unsized images, and footer",
+    "media-rss": "Image, video, and YouTube enclosures with captions",
+    podcast: "Podcast audio enclosure and episode artwork",
     substack: "Substack images, widgets, and footnotes",
     wordpress: "WordPress block and classic editor markup",
 };
@@ -110,7 +114,7 @@ export const COMMANDS = [
         name: "screenshot",
         summary: "check one case in WebKit and save its image",
         description: "Render and check a single case in WebKit and save its full-page screenshot: any " +
-            "fixture, on any platform. With --card, capture an 800x552 viewport at 2x, the " +
+            "fixture, on any platform, directly or --delivery through a sync service. With --card, capture an 800x552 viewport at 2x, the " +
             "shape of the marketplace card. With --promote, it becomes " +
             "screenshots/theme-preview.png, the marketplace card.",
         options: [
@@ -123,6 +127,12 @@ export const COMMANDS = [
             },
             { name: "platform", type: "string", choices: ["mac", "iphone", "ipad"], default: "mac" },
             { name: "appearance", type: "string", choices: ["light", "dark"], default: "light" },
+            {
+                name: "delivery",
+                type: "string",
+                choices: DELIVERIES,
+                help: "render the fixture as this sync service delivers it",
+            },
             { name: "card", type: "boolean", help: "capture the marketplace card's shape at 2x" },
             { name: "promote", type: "boolean", help: "use it as the marketplace screenshot" },
         ],
@@ -134,7 +144,7 @@ export const COMMANDS = [
     },
     {
         name: "fixture",
-        summary: "add fixtures modeled on WordPress, Ghost, Substack, and Medium",
+        summary: "add fixtures modeled on WordPress, Ghost, Substack, Medium, and Mastodon",
         description: "Copy ready-made fixtures with markup modeled on what major publishing platforms " +
             "send into fixtures/, where preview and check pick them up. Each one adds four " +
             "renders to every check.",