mdorigin 0.1.8 → 0.2.1

package/dist/core/content-store.js

@@ -1,4 +1,7 @@
 import path from 'node:path';
+export function isIgnoredContentName(name) {
+    return name.startsWith('.');
+}
 export class MemoryContentStore {
     entries;
     constructor(entries) {
@@ -23,7 +26,7 @@ export class MemoryContentStore {
                 continue;
             }
             const [firstSegment, ...rest] = remainder.split('/');
-            if (firstSegment.startsWith('.')) {
+            if (isIgnoredContentName(firstSegment)) {
                 continue;
             }
             if (rest.length === 0) {
@@ -53,6 +56,7 @@ const MEDIA_TYPES = new Map([
     ['.js', 'text/javascript; charset=utf-8'],
     ['.json', 'application/json; charset=utf-8'],
     ['.md', 'text/markdown; charset=utf-8'],
+    ['.mp4', 'video/mp4'],
     ['.pdf', 'application/pdf'],
     ['.py', 'text/plain; charset=utf-8'],
     ['.png', 'image/png'],
@@ -84,6 +88,9 @@ export function normalizeContentPath(inputPath) {
         resolved.includes('/../')) {
         return null;
     }
+    if (resolved.split('/').some(isIgnoredContentName)) {
+        return null;
+    }
     return resolved;
 }
 export function normalizeDirectoryPath(inputPath) {

package/dist/core/extensions.d.ts

@@ -1,7 +1,5 @@
 import type { ManagedIndexEntry, ParsedDocumentMeta } from './markdown.js';
 import type { EditLinkConfig, ResolvedSiteConfig, SiteLogo, SiteNavItem, SiteSocialLink } from './site-config.js';
-import type { TemplateName } from '../html/template-kind.js';
-import type { BuiltInThemeName } from '../html/theme.js';
 type MaybePromise<T> = T | Promise<T>;
 export interface IndexTransformContext {
     mode: 'build' | 'render';
@@ -11,7 +9,7 @@ export interface IndexTransformContext {
     siteConfig?: ResolvedSiteConfig;
 }
 export interface PageRenderModel {
-    kind: 'document' | 'catalog';
+    kind: 'page' | 'listing';
     requestPath: string;
     sourcePath: string;
     siteTitle: string;
@@ -27,8 +25,6 @@ export interface PageRenderModel {
     date?: string;
     showSummary: boolean;
     showDate: boolean;
-    theme: BuiltInThemeName;
-    template: TemplateName;
     topNav: SiteNavItem[];
     footerNav: SiteNavItem[];
     footerText?: string;
@@ -38,10 +34,10 @@ export interface PageRenderModel {
     stylesheetContent?: string;
     canonicalPath?: string;
     alternateMarkdownPath?: string;
-    catalogEntries: ManagedIndexEntry[];
-    catalogRequestPath: string;
-    catalogInitialPostCount: number;
-    catalogLoadMoreStep: number;
+    listingEntries: ManagedIndexEntry[];
+    listingRequestPath: string;
+    listingInitialPostCount: number;
+    listingLoadMoreStep: number;
     searchEnabled: boolean;
 }
 export interface RenderHookContext {

package/dist/core/markdown.d.ts

@@ -28,5 +28,6 @@ export declare function parseMarkdownDocument(sourcePath: string, markdown: stri
 export declare function renderMarkdown(markdown: string): Promise<string>;
 export declare function rewriteMarkdownLinksInHtml(html: string): string;
 export declare function stripManagedIndexBlock(markdown: string): string;
+export declare function stripMachineOnlyMarkdownComments(markdown: string): string;
 export declare function stripManagedIndexLinks(markdown: string, hrefs: ReadonlySet<string>): string;
 export declare function extractManagedIndexEntries(markdown: string): ManagedIndexEntry[];

package/dist/core/markdown.js

@@ -1,7 +1,9 @@
 import matter from 'gray-matter';
 import { remark } from 'remark';
 import remarkGfm from 'remark-gfm';
-import remarkHtml from 'remark-html';
+import remarkRehype from 'remark-rehype';
+import rehypeRaw from 'rehype-raw';
+import rehypeStringify from 'rehype-stringify';
 export function getDocumentTitle(meta, body, fallback) {
     return (firstNonEmptyString(meta.title, meta.name) ??
         extractFirstHeading(body) ??
@@ -24,7 +26,9 @@ export async function parseMarkdownDocument(sourcePath, markdown) {
 export async function renderMarkdown(markdown) {
     const output = await remark()
         .use(remarkGfm)
-        .use(remarkHtml)
+        .use(remarkRehype, { allowDangerousHtml: true })
+        .use(rehypeRaw)
+        .use(rehypeStringify, { allowDangerousHtml: true })
         .process(markdown);
     return String(output);
 }
@@ -34,6 +38,9 @@ export function rewriteMarkdownLinksInHtml(html) {
 export function stripManagedIndexBlock(markdown) {
     return markdown.replace(/\n?<!-- INDEX:START -->[\s\S]*?<!-- INDEX:END -->\n?/g, '\n').trimEnd();
 }
+export function stripMachineOnlyMarkdownComments(markdown) {
+    return markdown.replace(/<!--\s*mdorigin:[\s\S]*?-->/g, '');
+}
 export function stripManagedIndexLinks(markdown, hrefs) {
     if (hrefs.size === 0) {
         return markdown;

package/dist/core/request-handler.js

@@ -1,11 +1,12 @@
 import path from 'node:path';
+import { isIgnoredContentName } from './content-store.js';
 import { inferDirectoryContentType } from './content-type.js';
 import { getDirectoryIndexCandidates } from './directory-index.js';
 import { extractManagedIndexEntries, getDocumentSummary, getDocumentTitle as getParsedDocumentTitle, parseMarkdownDocument, stripManagedIndexBlock, stripManagedIndexLinks, } from './markdown.js';
 import { applyIndexTransforms, renderFooterOverride, renderHeaderOverride, renderPageWithPlugins, transformHtmlWithPlugins, } from './extensions.js';
 import { handleApiRoute } from './api.js';
 import { normalizeRequestPath, resolveRequest } from './router.js';
-import { escapeHtml, renderCatalogArticleItems, renderDocument, } from '../html/template.js';
+import { escapeHtml, renderListingArticleItems, renderDocument, } from '../html/template.js';
 export async function handleSiteRequest(store, pathname, options) {
     const plugins = options.plugins ?? [];
     const searchEnabled = options.searchApi !== undefined;
@@ -21,7 +22,7 @@ export async function handleSiteRequest(store, pathname, options) {
         return renderSitemap(store, options);
     }
     const resolved = resolveRequest(pathname);
-    const catalogFragmentRequest = getCatalogFragmentRequest(options.searchParams);
+    const listingFragmentRequest = getListingFragmentRequest(options.searchParams);
     const negotiatedMarkdown = shouldServeMarkdownForRequest(resolved, options.acceptHeader);
     if (resolved.kind === 'not-found' || !resolved.sourcePath) {
         const aliasRedirect = await tryRedirectAlias(store, pathname, options);
@@ -82,21 +83,16 @@ export async function handleSiteRequest(store, pathname, options) {
         : isRootHomeRequest(resolved.requestPath) && navigation.items.length > 0
             ? stripManagedIndexLinks(entry.text, new Set(navigation.items.map((item) => item.href)))
             : entry.text;
-    const catalogEntries = options.siteConfig.template === 'catalog'
-        ? await applyIndexTransforms(extractManagedIndexEntries(renderedBody), plugins, {
-            mode: 'render',
-            requestPath: resolved.requestPath,
-            sourcePath: resolved.sourcePath,
-            siteConfig: options.siteConfig,
-        })
-        : [];
-    if (catalogFragmentRequest !== null &&
-        options.siteConfig.template === 'catalog') {
-        return renderCatalogPostsFragment(catalogEntries, catalogFragmentRequest);
-    }
-    const documentBody = options.siteConfig.template === 'catalog'
-        ? stripManagedIndexBlock(renderedBody)
-        : renderedBody;
+    const listingEntries = await applyIndexTransforms(extractManagedIndexEntries(renderedBody), plugins, {
+        mode: 'render',
+        requestPath: resolved.requestPath,
+        sourcePath: resolved.sourcePath,
+        siteConfig: options.siteConfig,
+    });
+    if (listingFragmentRequest !== null && listingEntries.length > 0) {
+        return renderListingPostsFragment(listingEntries, listingFragmentRequest);
+    }
+    const documentBody = listingEntries.length > 0 ? stripManagedIndexBlock(renderedBody) : renderedBody;
     const renderedParsed = documentBody === entry.text
         ? parsed
         : await parseMarkdownDocument(resolved.sourcePath, documentBody);
@@ -107,18 +103,19 @@ export async function handleSiteRequest(store, pathname, options) {
         renderedParsed,
         siteConfig: options.siteConfig,
         topNav: navigation.items,
-        catalogEntries,
+        listingEntries,
         searchEnabled,
         plugins,
         varyOnAccept: shouldVaryOnAccept(resolved),
     });
 }
-function getCatalogFragmentRequest(searchParams) {
-    if (searchParams?.get('catalog-format') !== 'posts') {
+function getListingFragmentRequest(searchParams) {
+    const format = searchParams?.get('listing-format') ?? searchParams?.get('catalog-format');
+    if (format !== 'posts') {
         return null;
     }
-    const offset = normalizeNonNegativeInteger(searchParams.get('catalog-offset'));
-    const limit = normalizePositiveInteger(searchParams.get('catalog-limit'));
+    const offset = normalizeNonNegativeInteger(searchParams?.get('listing-offset') ?? searchParams?.get('catalog-offset') ?? null);
+    const limit = normalizePositiveInteger(searchParams?.get('listing-limit') ?? searchParams?.get('catalog-limit') ?? null);
     if (offset === null || limit === null) {
         return null;
     }
@@ -140,7 +137,7 @@ function normalizePositiveInteger(value) {
 }
 function buildPageRenderModel(options) {
     return {
-        kind: options.siteConfig.template === 'catalog' ? 'catalog' : 'document',
+        kind: options.listingEntries.length > 0 ? 'listing' : 'page',
         requestPath: options.resolvedRequestPath,
         sourcePath: options.sourcePath,
         siteTitle: options.siteConfig.siteTitle,
@@ -158,8 +155,6 @@ function buildPageRenderModel(options) {
         date: options.siteConfig.showDate === false ? undefined : options.parsed.meta.date,
         showSummary: options.siteConfig.showSummary,
         showDate: options.siteConfig.showDate,
-        theme: options.siteConfig.theme,
-        template: options.siteConfig.template,
         topNav: options.topNav,
         footerNav: options.siteConfig.footerNav,
         footerText: options.siteConfig.footerText,
@@ -169,10 +164,10 @@ function buildPageRenderModel(options) {
         stylesheetContent: options.siteConfig.stylesheetContent,
         canonicalPath: getCanonicalHtmlPathForContentPath(options.sourcePath),
         alternateMarkdownPath: getMarkdownRequestPathForContentPath(options.sourcePath),
-        catalogEntries: options.catalogEntries,
-        catalogRequestPath: options.resolvedRequestPath,
-        catalogInitialPostCount: options.siteConfig.catalogInitialPostCount,
-        catalogLoadMoreStep: options.siteConfig.catalogLoadMoreStep,
+        listingEntries: options.listingEntries,
+        listingRequestPath: options.resolvedRequestPath,
+        listingInitialPostCount: options.siteConfig.listingInitialPostCount,
+        listingLoadMoreStep: options.siteConfig.listingLoadMoreStep,
         searchEnabled: options.searchEnabled,
     };
 }
@@ -184,7 +179,7 @@ async function renderStructuredPage(options) {
         parsed: options.parsed,
         siteConfig: options.siteConfig,
         topNav: options.topNav,
-        catalogEntries: options.catalogEntries,
+        listingEntries: options.listingEntries,
         searchEnabled: options.searchEnabled,
     });
     const renderContext = {
@@ -198,7 +193,7 @@ async function renderStructuredPage(options) {
         };
         const headerHtml = await renderHeaderOverride(options.plugins, currentContext);
         const footerHtml = await renderFooterOverride(options.plugins, currentContext);
-        return (renderDocument({
+        return renderDocument({
             siteTitle: currentPage.siteTitle,
             siteDescription: currentPage.siteDescription,
             siteUrl: currentPage.siteUrl,
@@ -211,8 +206,6 @@ async function renderStructuredPage(options) {
             date: currentPage.date,
             showSummary: currentPage.showSummary,
             showDate: currentPage.showDate,
-            theme: currentPage.theme,
-            template: currentPage.template,
             topNav: currentPage.topNav,
             footerNav: currentPage.footerNav,
             footerText: currentPage.footerText,
@@ -221,14 +214,14 @@ async function renderStructuredPage(options) {
             stylesheetContent: currentPage.stylesheetContent,
             canonicalPath: currentPage.canonicalPath,
             alternateMarkdownPath: currentPage.alternateMarkdownPath,
-            catalogEntries: currentPage.catalogEntries,
-            catalogRequestPath: currentPage.catalogRequestPath,
-            catalogInitialPostCount: currentPage.catalogInitialPostCount,
-            catalogLoadMoreStep: currentPage.catalogLoadMoreStep,
+            listingEntries: currentPage.listingEntries,
+            listingRequestPath: currentPage.listingRequestPath,
+            listingInitialPostCount: currentPage.listingInitialPostCount,
+            listingLoadMoreStep: currentPage.listingLoadMoreStep,
             searchEnabled: currentPage.searchEnabled,
             headerHtml,
             footerHtml,
-        }));
+        });
     });
     const finalHtml = await transformHtmlWithPlugins(renderedPage.html, options.plugins, {
         page: renderedPage.page,
@@ -242,7 +235,7 @@ async function renderStructuredPage(options) {
         body: finalHtml,
     };
 }
-function renderCatalogPostsFragment(entries, request) {
+function renderListingPostsFragment(entries, request) {
     const articles = entries.filter((entry) => entry.kind === 'article');
     const visibleArticles = articles.slice(request.offset, request.offset + request.limit);
     const nextOffset = request.offset + visibleArticles.length;
@@ -252,7 +245,7 @@ function renderCatalogPostsFragment(entries, request) {
             'content-type': 'application/json; charset=utf-8',
         },
         body: JSON.stringify({
-            itemsHtml: renderCatalogArticleItems(visibleArticles),
+            itemsHtml: renderListingArticleItems(visibleArticles),
             hasMore: nextOffset < articles.length,
             nextOffset,
         }),
@@ -424,8 +417,6 @@ async function renderDirectoryListing(store, requestPath, siteConfig, searchEnab
             body,
             showSummary: false,
             showDate: false,
-            theme: siteConfig.theme,
-            template: siteConfig.template,
             topNav: navigation.items,
             footerNav: siteConfig.footerNav,
             footerText: siteConfig.footerText,
@@ -484,22 +475,17 @@ async function tryRenderAlternateDirectoryIndex(store, requestPath, options) {
             : isRootHomeRequest(requestPath) && navigation.items.length > 0
                 ? stripManagedIndexLinks(entry.text, new Set(navigation.items.map((item) => item.href)))
                 : entry.text;
-        const catalogEntries = options.siteConfig.template === 'catalog'
-            ? await applyIndexTransforms(extractManagedIndexEntries(renderedBody), plugins, {
-                mode: 'render',
-                requestPath,
-                sourcePath: candidatePath,
-                siteConfig: options.siteConfig,
-            })
-            : [];
-        const catalogFragmentRequest = getCatalogFragmentRequest(options.searchParams);
-        if (catalogFragmentRequest !== null &&
-            options.siteConfig.template === 'catalog') {
-            return renderCatalogPostsFragment(catalogEntries, catalogFragmentRequest);
-        }
-        const documentBody = options.siteConfig.template === 'catalog'
-            ? stripManagedIndexBlock(renderedBody)
-            : renderedBody;
+        const listingEntries = await applyIndexTransforms(extractManagedIndexEntries(renderedBody), plugins, {
+            mode: 'render',
+            requestPath,
+            sourcePath: candidatePath,
+            siteConfig: options.siteConfig,
+        });
+        const listingFragmentRequest = getListingFragmentRequest(options.searchParams);
+        if (listingFragmentRequest !== null && listingEntries.length > 0) {
+            return renderListingPostsFragment(listingEntries, listingFragmentRequest);
+        }
+        const documentBody = listingEntries.length > 0 ? stripManagedIndexBlock(renderedBody) : renderedBody;
         const renderedParsed = documentBody === entry.text
             ? parsed
             : await parseMarkdownDocument(candidatePath, documentBody);
@@ -510,7 +496,7 @@ async function tryRenderAlternateDirectoryIndex(store, requestPath, options) {
             renderedParsed,
             siteConfig: options.siteConfig,
             topNav: navigation.items,
-            catalogEntries,
+            listingEntries,
             searchEnabled: options.searchApi !== undefined,
             plugins,
         });
@@ -750,7 +736,7 @@ async function inspectDirectoryShape(store, directoryPath) {
     let hasExtraMarkdownFiles = false;
     let hasAssetFiles = false;
     for (const entry of entries) {
-        if (entry.name.startsWith('.')) {
+        if (isIgnoredContentName(entry.name)) {
             continue;
         }
         if (entry.kind === 'directory') {

package/dist/core/site-config.d.ts

@@ -1,7 +1,5 @@
 import type { ContentStore } from './content-store.js';
 import type { MdoPlugin } from './extensions.js';
-import type { TemplateName } from '../html/template-kind.js';
-import type { BuiltInThemeName } from '../html/theme.js';
 export interface SiteNavItem {
     label: string;
     href: string;
@@ -29,16 +27,14 @@ export interface SiteConfig {
     showDate?: boolean;
     showSummary?: boolean;
     stylesheet?: string;
-    theme?: BuiltInThemeName;
-    template?: TemplateName;
     topNav?: SiteNavItem[];
     footerNav?: SiteNavItem[];
     footerText?: string;
     socialLinks?: SiteSocialLink[];
     editLink?: EditLinkConfig;
     showHomeIndex?: boolean;
-    catalogInitialPostCount?: number;
-    catalogLoadMoreStep?: number;
+    listingInitialPostCount?: number;
+    listingLoadMoreStep?: number;
 }
 export interface UserSiteConfig extends SiteConfig {
     plugins?: MdoPlugin[];
@@ -52,16 +48,14 @@ export interface ResolvedSiteConfig {
     logo?: SiteLogo;
     showDate: boolean;
     showSummary: boolean;
-    theme: BuiltInThemeName;
-    template: TemplateName;
     topNav: SiteNavItem[];
     footerNav: SiteNavItem[];
     footerText?: string;
     socialLinks: SiteSocialLink[];
     editLink?: EditLinkConfig;
     showHomeIndex: boolean;
-    catalogInitialPostCount: number;
-    catalogLoadMoreStep: number;
+    listingInitialPostCount: number;
+    listingLoadMoreStep: number;
     stylesheetContent?: string;
     siteTitleConfigured: boolean;
     siteDescriptionConfigured: boolean;

package/dist/core/site-config.js

@@ -14,6 +14,7 @@ export async function loadUserSiteConfig(options = {}) {
         ? path.resolve(cwd, options.configPath)
         : await resolveDefaultConfigPath(cwd, rootDir);
     const parsedConfig = await loadConfigSource(configFilePath);
+    const legacyConfig = parsedConfig;
     const stylesheetPath = parsedConfig.stylesheet
         ? path.resolve(path.dirname(configFilePath), parsedConfig.stylesheet)
         : null;
@@ -34,8 +35,6 @@ export async function loadUserSiteConfig(options = {}) {
         logo: normalizeLogo(parsedConfig.logo),
         showDate: parsedConfig.showDate ?? true,
         showSummary: parsedConfig.showSummary ?? true,
-        theme: isBuiltInThemeName(parsedConfig.theme) ? parsedConfig.theme : 'paper',
-        template: isTemplateName(parsedConfig.template) ? parsedConfig.template : 'document',
         topNav: normalizeTopNav(parsedConfig.topNav),
         footerNav: normalizeTopNav(parsedConfig.footerNav),
         footerText: typeof parsedConfig.footerText === 'string' && parsedConfig.footerText !== ''
@@ -46,13 +45,14 @@ export async function loadUserSiteConfig(options = {}) {
         showHomeIndex: typeof parsedConfig.showHomeIndex === 'boolean'
             ? parsedConfig.showHomeIndex
             : normalizeTopNav(parsedConfig.topNav).length === 0,
-        catalogInitialPostCount: normalizePositiveInteger(parsedConfig.catalogInitialPostCount, 10),
-        catalogLoadMoreStep: normalizePositiveInteger(parsedConfig.catalogLoadMoreStep, 10),
+        listingInitialPostCount: normalizePositiveInteger(parsedConfig.listingInitialPostCount ?? legacyConfig.catalogInitialPostCount, 10),
+        listingLoadMoreStep: normalizePositiveInteger(parsedConfig.listingLoadMoreStep ?? legacyConfig.catalogLoadMoreStep, 10),
         stylesheetContent,
         siteTitleConfigured: typeof parsedConfig.siteTitle === 'string' && parsedConfig.siteTitle !== '',
         siteDescriptionConfigured: typeof parsedConfig.siteDescription === 'string' &&
             parsedConfig.siteDescription !== '',
     };
+    warnOnLegacyConfig(legacyConfig, configFilePath);
     return {
         siteConfig,
         plugins: Array.isArray(parsedConfig.plugins) ? parsedConfig.plugins : [],
@@ -93,12 +93,6 @@ async function resolveDefaultConfigPath(cwd, rootDir) {
     }
     return (await findConfigPath(cwd)) ?? path.join(cwd, 'mdorigin.config.json');
 }
-function isBuiltInThemeName(value) {
-    return value === 'paper' || value === 'atlas' || value === 'gazette';
-}
-function isTemplateName(value) {
-    return value === 'document' || value === 'catalog';
-}
 function isNodeNotFound(error) {
     return (typeof error === 'object' &&
         error !== null &&
@@ -275,3 +269,17 @@ function normalizeSiteHref(value) {
     }
     return `/${value.replace(/^\.?\//, '')}`;
 }
+function warnOnLegacyConfig(config, configFilePath) {
+    if ('theme' in config) {
+        console.warn(`[mdorigin] ${configFilePath}: "theme" is deprecated and ignored. mdorigin now uses a single built-in atlas presentation.`);
+    }
+    if ('template' in config) {
+        console.warn(`[mdorigin] ${configFilePath}: "template" is deprecated and ignored. Listing behavior is now part of the default presentation.`);
+    }
+    if ('catalogInitialPostCount' in config) {
+        console.warn(`[mdorigin] ${configFilePath}: "catalogInitialPostCount" is deprecated. Use "listingInitialPostCount" instead.`);
+    }
+    if ('catalogLoadMoreStep' in config) {
+        console.warn(`[mdorigin] ${configFilePath}: "catalogLoadMoreStep" is deprecated. Use "listingLoadMoreStep" instead.`);
+    }
+}

package/dist/html/template.d.ts

@@ -1,7 +1,5 @@
 import type { SiteLogo, SiteNavItem, SiteSocialLink } from '../core/site-config.js';
 import type { ManagedIndexEntry } from '../core/markdown.js';
-import type { TemplateName } from './template-kind.js';
-import { type BuiltInThemeName } from './theme.js';
 export interface RenderDocumentOptions {
     siteTitle: string;
     siteDescription?: string;
@@ -15,8 +13,6 @@ export interface RenderDocumentOptions {
     date?: string;
     showSummary?: boolean;
     showDate?: boolean;
-    theme: BuiltInThemeName;
-    template: TemplateName;
     topNav?: SiteNavItem[];
     footerNav?: SiteNavItem[];
     footerText?: string;
@@ -25,14 +21,14 @@ export interface RenderDocumentOptions {
     stylesheetContent?: string;
     canonicalPath?: string;
     alternateMarkdownPath?: string;
-    catalogEntries?: ManagedIndexEntry[];
-    catalogRequestPath?: string;
-    catalogInitialPostCount?: number;
-    catalogLoadMoreStep?: number;
+    listingEntries?: ManagedIndexEntry[];
+    listingRequestPath?: string;
+    listingInitialPostCount?: number;
+    listingLoadMoreStep?: number;
     searchEnabled?: boolean;
     headerHtml?: string;
     footerHtml?: string;
 }
 export declare function renderDocument(options: RenderDocumentOptions): string;
 export declare function escapeHtml(value: string): string;
-export declare function renderCatalogArticleItems(entries: readonly ManagedIndexEntry[]): string;
+export declare function renderListingArticleItems(entries: readonly ManagedIndexEntry[]): string;

package/dist/html/template.js

@@ -1,4 +1,4 @@
-import { getBuiltInThemeStyles } from './theme.js';
+import { getDefaultThemeStyles } from './theme.js';
 export function renderDocument(options) {
     const title = escapeHtml(options.title);
     const siteTitle = escapeHtml(options.siteTitle);
@@ -25,7 +25,7 @@ export function renderDocument(options) {
     const alternateMarkdownMeta = options.alternateMarkdownPath
         ? `<link rel="alternate" type="text/markdown" href="${escapeHtml(options.alternateMarkdownPath)}">`
         : '';
-    const stylesheetBlock = `<style>${getBuiltInThemeStyles(options.theme)}${options.stylesheetContent ? `\n${options.stylesheetContent}` : ''}</style>`;
+    const stylesheetBlock = `<style>${getDefaultThemeStyles()}${options.stylesheetContent ? `\n${options.stylesheetContent}` : ''}</style>`;
     const navBlock = options.topNav && options.topNav.length > 0
         ? `<nav class="site-nav"><ul>${options.topNav
             .map((item) => `<li><a href="${escapeHtml(item.href)}">${escapeHtml(item.label)}</a></li>`)
@@ -84,11 +84,11 @@ export function renderDocument(options) {
     const footerBlock = footerNavBlock || footerTextBlock || footerMetaBlock
         ? `<footer class="site-footer"><div class="site-footer__inner">${footerNavBlock}${footerTextBlock}${footerMetaBlock}</div></footer>`
         : '';
-    const articleBody = options.template === 'catalog'
-        ? renderCatalogArticle(options.body, options.catalogEntries ?? [], {
-            requestPath: options.catalogRequestPath ?? '/',
-            initialPostCount: options.catalogInitialPostCount ?? 10,
-            loadMoreStep: options.catalogLoadMoreStep ?? 10,
+    const articleBody = options.listingEntries && options.listingEntries.length > 0
+        ? renderListingArticle(options.body, options.listingEntries, {
+            requestPath: options.listingRequestPath ?? '/',
+            initialPostCount: options.listingInitialPostCount ?? 10,
+            loadMoreStep: options.listingLoadMoreStep ?? 10,
         })
         : options.body;
     const searchScript = options.searchEnabled ? renderSearchScript() : '';
@@ -109,7 +109,7 @@ export function renderDocument(options) {
         alternateMarkdownMeta,
         stylesheetBlock,
         '</head>',
-        `<body data-theme="${options.theme}" data-template="${options.template}">`,
+        '<body>',
         headerBlock,
         '<main>',
         `<article>${articleBody}</article>`,
@@ -159,7 +159,7 @@ function renderSocialIcon(icon) {
 function iconSvg(pathData) {
     return `<svg viewBox="0 0 24 24" aria-hidden="true"><path d="${pathData}"></path></svg>`;
 }
-function renderCatalogArticle(body, entries, options) {
+function renderListingArticle(body, entries, options) {
     if (entries.length === 0) {
         return body;
     }
@@ -170,10 +170,10 @@ function renderCatalogArticle(body, entries, options) {
     const shouldLoadMore = articles.length > visibleArticles.length;
     return [
         `<div class="catalog-page__body">${body}</div>`,
-        '<section class="catalog-page" aria-label="Catalog">',
-        directories.length > 0 ? renderCatalogDirectories(directories) : '',
+        '<section class="catalog-page" aria-label="Content listing">',
+        directories.length > 0 ? renderListingDirectories(directories) : '',
         articles.length > 0
-            ? renderCatalogArticles(visibleArticles, {
+            ? renderListingArticles(visibleArticles, {
                 requestPath: options.requestPath,
                 nextOffset: visibleArticles.length,
                 loadMoreStep: options.loadMoreStep,
@@ -181,10 +181,10 @@ function renderCatalogArticle(body, entries, options) {
             })
             : '',
         '</section>',
-        shouldLoadMore ? renderCatalogLoadMoreScript() : '',
+        shouldLoadMore ? renderListingLoadMoreScript() : '',
     ].join('');
 }
-function renderCatalogDirectories(entries) {
+function renderListingDirectories(entries) {
     return [
         '<div class="catalog-list catalog-list--directories">',
         ...entries.map((entry) => `<a class="catalog-item catalog-item--directory" href="${escapeHtml(entry.href)}"><strong class="catalog-item__title">${escapeHtml(entry.title)}</strong>${entry.detail
@@ -193,28 +193,28 @@ function renderCatalogDirectories(entries) {
         '</div>',
     ].join('');
 }
-export function renderCatalogArticleItems(entries) {
+export function renderListingArticleItems(entries) {
     return entries
         .map((entry) => `<a class="catalog-item" href="${escapeHtml(entry.href)}"><strong class="catalog-item__title">${escapeHtml(entry.title)}</strong>${entry.detail
         ? `<span class="catalog-item__detail">${escapeHtml(entry.detail)}</span>`
         : ''}</a>`)
         .join('');
 }
-function renderCatalogArticles(entries, options) {
+function renderListingArticles(entries, options) {
     return [
-        '<div class="catalog-list" data-catalog-articles>',
-        renderCatalogArticleItems(entries),
+        '<div class="catalog-list" data-listing-articles>',
+        renderListingArticleItems(entries),
         '</div>',
         options.hasMore
-            ? `<div class="catalog-load-more"><button type="button" class="catalog-load-more__button" data-catalog-load-more data-request-path="${escapeHtml(options.requestPath)}" data-next-offset="${escapeHtml(String(options.nextOffset))}" data-load-more-step="${escapeHtml(String(options.loadMoreStep))}">Load more</button></div>`
+            ? `<div class="catalog-load-more"><button type="button" class="catalog-load-more__button" data-listing-load-more data-request-path="${escapeHtml(options.requestPath)}" data-next-offset="${escapeHtml(String(options.nextOffset))}" data-load-more-step="${escapeHtml(String(options.loadMoreStep))}">Load more</button></div>`
             : '',
     ].join('');
 }
-function renderCatalogLoadMoreScript() {
+function renderListingLoadMoreScript() {
     return `<script>
 (() => {
-  const button = document.querySelector('[data-catalog-load-more]');
-  const list = document.querySelector('[data-catalog-articles]');
+  const button = document.querySelector('[data-listing-load-more]');
+  const list = document.querySelector('[data-listing-articles]');
   if (!(button instanceof HTMLButtonElement) || !(list instanceof HTMLElement)) {
     return;
   }
@@ -233,9 +233,9 @@ function renderCatalogLoadMoreScript() {
 
     try {
       const url = new URL(requestPath, window.location.origin);
-      url.searchParams.set('catalog-format', 'posts');
-      url.searchParams.set('catalog-offset', nextOffset);
-      url.searchParams.set('catalog-limit', loadMoreStep);
+      url.searchParams.set('listing-format', 'posts');
+      url.searchParams.set('listing-offset', nextOffset);
+      url.searchParams.set('listing-limit', loadMoreStep);
 
       const response = await fetch(url.toString(), {
         headers: { Accept: 'application/json' },

package/dist/html/theme.d.ts

@@ -1,2 +1 @@
-export type BuiltInThemeName = 'paper' | 'atlas' | 'gazette';
-export declare function getBuiltInThemeStyles(theme: BuiltInThemeName): string;
+export declare function getDefaultThemeStyles(): string;