edgepress 2026.10.12 → 2026.10.13

package/src/content.js

@@ -1,239 +1,239 @@
-import {parsePublicationDate,publicationCalendar} from './publication-time.js';
-import { readPostRevision } from './revisions.js';
-import { normalizeCategory, safeAvatar, readingMinutes } from './post-details.js';
-import { readdir, readFile } from 'node:fs/promises';
-import { basename, dirname, extname, relative, resolve, sep } from 'node:path';
-import { parse as parseYaml } from 'yaml';
-import { mapLimit } from './concurrency.js';
-
-export function sortPostsNewest(posts) {
-  return [...posts].sort((left, right) => {
-    const dateOrder = right.date - left.date;
-    if (dateOrder) return dateOrder;
-    const leftPath = String(left.path);
-    const rightPath = String(right.path);
-    return rightPath.localeCompare(leftPath, undefined, { numeric: true, sensitivity: 'base' });
-  });
-}
-
-export function postsForLocale(posts, locale, defaultLocale) {
-  const byBundle = new Map();
-  for (const post of posts) {
-    const current = byBundle.get(post.bundlePath);
-    if (!current || post.locale === locale || (current.locale !== locale && post.locale === defaultLocale) ||
-        (current.locale !== locale && current.locale !== defaultLocale && post.locale !== defaultLocale && post.locale.localeCompare(current.locale) < 0)) {
-      byBundle.set(post.bundlePath, post);
-    }
-  }
-  return sortPostsNewest([...byBundle.values()]);
-}
-
-async function walkContent(directory, kind) {
-  let entries;
-  try {
-    entries = await readdir(directory, { withFileTypes: true });
-  } catch (error) {
-    if (error.code === 'ENOENT') return [];
-    throw error;
-  }
-  entries.sort((a, b) => a.name.localeCompare(b.name));
-  const found = [];
-  for (const entry of entries) {
-    const fullPath = resolve(directory, entry.name);
-    if (entry.isDirectory()) found.push(...await walkContent(fullPath, kind));
-    else if (entry.isFile() && (extname(entry.name).toLowerCase() === '.md' || (kind === 'pages' && extname(entry.name).toLowerCase() === '.json'))) found.push(fullPath);
-  }
-  return found;
-}
-
-function splitFrontmatter(source, file) {
-  const lines = source.replace(/^\uFEFF/, '').split(/\r?\n/);
-  if (lines[0] !== '---') return { metadata: {}, markdown: source };
-  const end = lines.findIndex((line, index) => index > 0 && (line === '---' || line === '...'));
-  if (end < 0) throw new Error('Unclosed YAML front matter in ' + file);
-  const metadata = parseYaml(lines.slice(1, end).join('\n')) ?? {};
-  if (!metadata || typeof metadata !== 'object' || Array.isArray(metadata)) {
-    throw new Error('Front matter must be a YAML object in ' + file);
-  }
-  return { metadata, markdown: lines.slice(end + 1).join('\n') };
-}
-
-export function parseDocumentSource(source, file) {
-  if (extname(file).toLowerCase() !== '.json') return splitFrontmatter(source, file);
-  let metadata;
-  try { metadata = JSON.parse(source.replace(/^\uFEFF/, '')); }
-  catch (error) { throw new Error('Invalid page JSON in ' + file + ': ' + error.message, {cause: error}); }
-  if (!metadata || typeof metadata !== 'object' || Array.isArray(metadata)) throw new Error('Page JSON must be an object in ' + file);
-  return {metadata, markdown: ''};
-}
-
-export function slugify(value) {
-  const slug = String(value)
-    .normalize('NFKC')
-    .toLowerCase()
-    .replace(/[^\p{L}\p{N}]+/gu, '-')
-    .replace(/^-+|-+$/g, '');
-  return slug || 'post';
-}
-
-function normalizeTags(value) {
-  if (value == null || value === '') return [];
-  return (Array.isArray(value) ? value : [value]).map(String).map((tag) => tag.trim()).filter(Boolean);
-}
-
-function normalizeAuthor(value, file) {
-  if (value && typeof value === 'object' && !Array.isArray(value)) {
-    if (Object.keys(value).some(key => !['name', 'avatar'].includes(key))) throw new Error('Unsupported author field in ' + file);
-    value = value.name;
-  }
-  if (value === undefined || value === null || value === '') return '';
-  if (typeof value !== 'string' || !value.trim() || value.length > 160) {
-    throw new Error('author must be a non-empty string of at most 160 characters in ' + file);
-  }
-  return value.trim();
-}
-
-function normalizeVideo(value, file) {
-  if (value === undefined) return null;
-  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('video must be an object in ' + file);
-  for (const key of Object.keys(value)) {
-    if (!['src', 'captions', 'captionLanguage', 'captionLabel', 'poster', 'alt', 'title', 'description'].includes(key)) {
-      throw new Error('Unsupported video field in ' + file + ': ' + key);
-    }
-  }
-  const localAsset = /^\/edgepress\/media\/[a-z0-9-]+\.(?:mp4|vtt|jpe?g)$/i;
-  for (const field of ['src', 'captions', 'poster']) {
-    if (typeof value[field] !== 'string' || !localAsset.test(value[field])) {
-      throw new Error('video.' + field + ' must reference a local /edgepress/media asset in ' + file);
-    }
-  }
-  if (typeof value.captionLanguage !== 'string' || !/^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/.test(value.captionLanguage) ||
-      typeof value.captionLabel !== 'string' || !value.captionLabel.trim() || typeof value.alt !== 'string' || !value.alt.trim() ||
-      typeof value.title !== 'string' || !value.title.trim() || typeof value.description !== 'string' || !value.description.trim()) {
-    throw new Error('video needs a language, labels, accessible description, title, and summary in ' + file);
-  }
-  return value;
-}
-
-function normalizeDate(value, filename, kind, file, timeZone) {
-  const fallback = filename.match(/^(\d{4}-\d{2}-\d{2})-/)?.[1];
-  if (value == null && !fallback) {
-    if (kind === 'posts') throw new Error('Posts need a valid date in front matter or a YYYY-MM-DD filename: ' + file);
-    return new Date(0);
-  }
-  try { return parsePublicationDate(value ?? fallback, timeZone); }
-  catch (error) { throw new Error(error.message + ' in ' + file); }
-}
-
-function normalizePagePath(value, file) {
-  if (typeof value !== 'string' || !value.trim()) throw new Error('Page folder or slug must be a non-empty path: ' + file);
-  const source = value.trim();
-  if (source.startsWith('/') || source.includes('\\') || /[%?#\0]/.test(source)) throw new Error('Page path contains unsafe URL characters: ' + file);
-  const segments = source.split('/');
-  if (segments.some((part) => !part || part === '.' || part === '..')) throw new Error('Page path contains an empty or traversal segment: ' + file);
-  const parts = segments.map((part) => slugify(part));
-  if (parts.some((part) => !part)) throw new Error('Page path contains an invalid segment: ' + file);
-  return parts.join('/');
-}
-
-export async function readDocuments(config) {
-  const root = config.resolvedPaths.content;
-  const groups = [['posts', resolve(root, 'posts')], ['pages', resolve(root, 'pages')]];
-  const files = [];
-  for (const [kind, directory] of groups) {
-    const identities = new Set();
-    for (const file of await walkContent(directory, kind)) {
-      const identity = resolve(dirname(file), basename(file, extname(file)).toLowerCase());
-      if (identities.has(identity)) throw new Error('Duplicate language document; keep only one .json or .md file per page locale: ' + file);
-      identities.add(identity);
-      files.push({ kind, file });
-    }
-  }
-  return await mapLimit(files, config.concurrency, async ({ kind, file }) => {
-    const source = await readFile(file, 'utf8');
-    const { metadata, markdown } = parseDocumentSource(source, file);
-    const contentRoot = resolve(root, kind);
-    const relativePath = relative(contentRoot, file).split(sep).join('/');
-    const bundleDirectory = dirname(file);
-    const bundlePath = relative(contentRoot, bundleDirectory).split(sep).join('/');
-    if (!bundlePath || bundlePath === '.' || bundlePath.startsWith('..')) {
-      throw new Error('Each content document must have its own folder with one file per language: ' + file);
-    }
-    const bundleName = basename(bundleDirectory);
-    const languageFileName = basename(file, extname(file));
-    const languageFile = languageFileName.toLowerCase();
-    const fileLocale = config.i18n.locales.find((locale) => locale.toLowerCase() === languageFile);
-    if (!fileLocale || languageFileName !== languageFile) {
-      throw new Error('Content language files must be named after a configured locale, such as en.json or zh-cn.md: ' + file);
-    }
-    const declaredLocale = metadata.lang === undefined ? fileLocale :
-      config.i18n.locales.find((locale) => locale.toLowerCase() === String(metadata.lang).toLowerCase());
-    if (!declaredLocale) throw new Error('Unsupported lang value in ' + file + '; use the language filename and configure its language pack');
-    if (declaredLocale !== fileLocale) throw new Error('Content lang must match the content filename locale in ' + file);
-    const locale = fileLocale;
-    const fallbackSlug = bundlePath.replace(/\\/g, '/');
-    const fallbackName = bundleName.replace(/^\d{4}-\d{2}-\d{2}-/, '');
-    const fallbackTitle = fallbackName.replace(/[-_]/g, ' ');
-    const title = String(metadata.title ?? fallbackTitle).trim();
-    if (!title) throw new Error('Document needs a non-empty title: ' + file);
-    if (metadata.homepage !== undefined && typeof metadata.homepage !== 'boolean') {
-      throw new Error('homepage must be a boolean in ' + file);
-    }
-    if (metadata.homepage === true && kind !== 'pages') throw new Error('Only pages can be marked as the homepage: ' + file);
-    if (metadata.blocks !== undefined && (kind !== 'pages' || !Array.isArray(metadata.blocks) || metadata.blocks.length > 100)) {
-      throw new Error('blocks must be an array of at most 100 items on a page: ' + file);
-    }
-    if (kind === 'pages' && (!Array.isArray(metadata.blocks) || metadata.blocks.length === 0)) {
-      throw new Error('Pages need an ordered blocks array; use Markdown only for posts: ' + file);
-    }
-    if (kind === 'pages' && markdown.trim()) {
-      throw new Error('Page body must be empty; move content into page blocks: ' + file);
-    }
+import {parsePublicationDate,publicationCalendar} from './publication-time.js';
+import { readPostRevision } from './revisions.js';
+import { normalizeCategory, safeAvatar, readingMinutes } from './post-details.js';
+import { readdir, readFile } from 'node:fs/promises';
+import { basename, dirname, extname, relative, resolve, sep } from 'node:path';
+import { parse as parseYaml } from 'yaml';
+import { mapLimit } from './concurrency.js';
+
+export function sortPostsNewest(posts) {
+  return [...posts].sort((left, right) => {
+    const dateOrder = right.date - left.date;
+    if (dateOrder) return dateOrder;
+    const leftPath = String(left.path);
+    const rightPath = String(right.path);
+    return rightPath.localeCompare(leftPath, undefined, { numeric: true, sensitivity: 'base' });
+  });
+}
+
+export function postsForLocale(posts, locale, defaultLocale) {
+  const byBundle = new Map();
+  for (const post of posts) {
+    const current = byBundle.get(post.bundlePath);
+    if (!current || post.locale === locale || (current.locale !== locale && post.locale === defaultLocale) ||
+        (current.locale !== locale && current.locale !== defaultLocale && post.locale !== defaultLocale && post.locale.localeCompare(current.locale) < 0)) {
+      byBundle.set(post.bundlePath, post);
+    }
+  }
+  return sortPostsNewest([...byBundle.values()]);
+}
+
+async function walkContent(directory, kind) {
+  let entries;
+  try {
+    entries = await readdir(directory, { withFileTypes: true });
+  } catch (error) {
+    if (error.code === 'ENOENT') return [];
+    throw error;
+  }
+  entries.sort((a, b) => a.name.localeCompare(b.name));
+  const found = [];
+  for (const entry of entries) {
+    const fullPath = resolve(directory, entry.name);
+    if (entry.isDirectory()) found.push(...await walkContent(fullPath, kind));
+    else if (entry.isFile() && (extname(entry.name).toLowerCase() === '.md' || (kind === 'pages' && extname(entry.name).toLowerCase() === '.json'))) found.push(fullPath);
+  }
+  return found;
+}
+
+function splitFrontmatter(source, file) {
+  const lines = source.replace(/^\uFEFF/, '').split(/\r?\n/);
+  if (lines[0] !== '---') return { metadata: {}, markdown: source };
+  const end = lines.findIndex((line, index) => index > 0 && (line === '---' || line === '...'));
+  if (end < 0) throw new Error('Unclosed YAML front matter in ' + file);
+  const metadata = parseYaml(lines.slice(1, end).join('\n')) ?? {};
+  if (!metadata || typeof metadata !== 'object' || Array.isArray(metadata)) {
+    throw new Error('Front matter must be a YAML object in ' + file);
+  }
+  return { metadata, markdown: lines.slice(end + 1).join('\n') };
+}
+
+export function parseDocumentSource(source, file) {
+  if (extname(file).toLowerCase() !== '.json') return splitFrontmatter(source, file);
+  let metadata;
+  try { metadata = JSON.parse(source.replace(/^\uFEFF/, '')); }
+  catch (error) { throw new Error('Invalid page JSON in ' + file + ': ' + error.message, {cause: error}); }
+  if (!metadata || typeof metadata !== 'object' || Array.isArray(metadata)) throw new Error('Page JSON must be an object in ' + file);
+  return {metadata, markdown: ''};
+}
+
+export function slugify(value) {
+  const slug = String(value)
+    .normalize('NFKC')
+    .toLowerCase()
+    .replace(/[^\p{L}\p{N}]+/gu, '-')
+    .replace(/^-+|-+$/g, '');
+  return slug || 'post';
+}
+
+function normalizeTags(value) {
+  if (value == null || value === '') return [];
+  return (Array.isArray(value) ? value : [value]).map(String).map((tag) => tag.trim()).filter(Boolean);
+}
+
+function normalizeAuthor(value, file) {
+  if (value && typeof value === 'object' && !Array.isArray(value)) {
+    if (Object.keys(value).some(key => !['name', 'avatar'].includes(key))) throw new Error('Unsupported author field in ' + file);
+    value = value.name;
+  }
+  if (value === undefined || value === null || value === '') return '';
+  if (typeof value !== 'string' || !value.trim() || value.length > 160) {
+    throw new Error('author must be a non-empty string of at most 160 characters in ' + file);
+  }
+  return value.trim();
+}
+
+function normalizeVideo(value, file) {
+  if (value === undefined) return null;
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('video must be an object in ' + file);
+  for (const key of Object.keys(value)) {
+    if (!['src', 'captions', 'captionLanguage', 'captionLabel', 'poster', 'alt', 'title', 'description'].includes(key)) {
+      throw new Error('Unsupported video field in ' + file + ': ' + key);
+    }
+  }
+  const localAsset = /^\/edgepress\/media\/[a-z0-9-]+\.(?:mp4|vtt|jpe?g)$/i;
+  for (const field of ['src', 'captions', 'poster']) {
+    if (typeof value[field] !== 'string' || !localAsset.test(value[field])) {
+      throw new Error('video.' + field + ' must reference a local /edgepress/media asset in ' + file);
+    }
+  }
+  if (typeof value.captionLanguage !== 'string' || !/^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/.test(value.captionLanguage) ||
+      typeof value.captionLabel !== 'string' || !value.captionLabel.trim() || typeof value.alt !== 'string' || !value.alt.trim() ||
+      typeof value.title !== 'string' || !value.title.trim() || typeof value.description !== 'string' || !value.description.trim()) {
+    throw new Error('video needs a language, labels, accessible description, title, and summary in ' + file);
+  }
+  return value;
+}
+
+function normalizeDate(value, filename, kind, file, timeZone) {
+  const fallback = filename.match(/^(\d{4}-\d{2}-\d{2})-/)?.[1];
+  if (value == null && !fallback) {
+    if (kind === 'posts') throw new Error('Posts need a valid date in front matter or a YYYY-MM-DD filename: ' + file);
+    return new Date(0);
+  }
+  try { return parsePublicationDate(value ?? fallback, timeZone); }
+  catch (error) { throw new Error(error.message + ' in ' + file); }
+}
+
+function normalizePagePath(value, file) {
+  if (typeof value !== 'string' || !value.trim()) throw new Error('Page folder or slug must be a non-empty path: ' + file);
+  const source = value.trim();
+  if (source.startsWith('/') || source.includes('\\') || /[%?#\0]/.test(source)) throw new Error('Page path contains unsafe URL characters: ' + file);
+  const segments = source.split('/');
+  if (segments.some((part) => !part || part === '.' || part === '..')) throw new Error('Page path contains an empty or traversal segment: ' + file);
+  const parts = segments.map((part) => slugify(part));
+  if (parts.some((part) => !part)) throw new Error('Page path contains an invalid segment: ' + file);
+  return parts.join('/');
+}
+
+export async function readDocuments(config) {
+  const root = config.resolvedPaths.content;
+  const groups = [['posts', resolve(root, 'posts')], ['pages', resolve(root, 'pages')]];
+  const files = [];
+  for (const [kind, directory] of groups) {
+    const identities = new Set();
+    for (const file of await walkContent(directory, kind)) {
+      const identity = resolve(dirname(file), basename(file, extname(file)).toLowerCase());
+      if (identities.has(identity)) throw new Error('Duplicate language document; keep only one .json or .md file per page locale: ' + file);
+      identities.add(identity);
+      files.push({ kind, file });
+    }
+  }
+  return await mapLimit(files, config.concurrency, async ({ kind, file }) => {
+    const source = await readFile(file, 'utf8');
+    const { metadata, markdown } = parseDocumentSource(source, file);
+    const contentRoot = resolve(root, kind);
+    const relativePath = relative(contentRoot, file).split(sep).join('/');
+    const bundleDirectory = dirname(file);
+    const bundlePath = relative(contentRoot, bundleDirectory).split(sep).join('/');
+    if (!bundlePath || bundlePath === '.' || bundlePath.startsWith('..')) {
+      throw new Error('Each content document must have its own folder with one file per language: ' + file);
+    }
+    const bundleName = basename(bundleDirectory);
+    const languageFileName = basename(file, extname(file));
+    const languageFile = languageFileName.toLowerCase();
+    const fileLocale = config.i18n.locales.find((locale) => locale.toLowerCase() === languageFile);
+    if (!fileLocale || languageFileName !== languageFile) {
+      throw new Error('Content language files must be named after a configured locale, such as en.json or zh-cn.md: ' + file);
+    }
+    const declaredLocale = metadata.lang === undefined ? fileLocale :
+      config.i18n.locales.find((locale) => locale.toLowerCase() === String(metadata.lang).toLowerCase());
+    if (!declaredLocale) throw new Error('Unsupported lang value in ' + file + '; use the language filename and configure its language pack');
+    if (declaredLocale !== fileLocale) throw new Error('Content lang must match the content filename locale in ' + file);
+    const locale = fileLocale;
+    const fallbackSlug = bundlePath.replace(/\\/g, '/');
+    const fallbackName = bundleName.replace(/^\d{4}-\d{2}-\d{2}-/, '');
+    const fallbackTitle = fallbackName.replace(/[-_]/g, ' ');
+    const title = String(metadata.title ?? fallbackTitle).trim();
+    if (!title) throw new Error('Document needs a non-empty title: ' + file);
+    if (metadata.homepage !== undefined && typeof metadata.homepage !== 'boolean') {
+      throw new Error('homepage must be a boolean in ' + file);
+    }
+    if (metadata.homepage === true && kind !== 'pages') throw new Error('Only pages can be marked as the homepage: ' + file);
+    if (metadata.blocks !== undefined && (kind !== 'pages' || !Array.isArray(metadata.blocks) || metadata.blocks.length > 100)) {
+      throw new Error('blocks must be an array of at most 100 items on a page: ' + file);
+    }
+    if (kind === 'pages' && (!Array.isArray(metadata.blocks) || metadata.blocks.length === 0)) {
+      throw new Error('Pages need an ordered blocks array; use Markdown only for posts: ' + file);
+    }
+    if (kind === 'pages' && markdown.trim()) {
+      throw new Error('Page body must be empty; move content into page blocks: ' + file);
+    }
     if (metadata.pinned !== undefined && typeof metadata.pinned !== 'boolean') throw new Error('pinned must be a boolean in ' + file);
     if (metadata.embeds !== undefined) throw new Error('Use !embed[service](URL) in the content instead of front-matter embeds: ' + file);
-    const rawSlug = metadata.slug ?? (kind === 'posts' ? fallbackName : fallbackSlug);
-    const normalizedPagePath = kind === 'pages' && metadata.homepage !== true ? normalizePagePath(rawSlug, file) : '';
-    const slug = slugify(String(rawSlug).split('/').pop());
-    const date = normalizeDate(metadata.date, bundleName, kind, file, config.site?.timeZone);
-    const calendar = metadata.date == null ? (bundleName.match(/^(\d{4}-\d{2}-\d{2})-/)?.[1] || '1970-01-01') : publicationCalendar(metadata.date,date,config.site?.timeZone);
-    if (metadata.showChanges !== undefined && typeof metadata.showChanges !== 'boolean') throw new Error('showChanges must be a boolean in ' + file);
+    const rawSlug = metadata.slug ?? (kind === 'posts' ? fallbackName : fallbackSlug);
+    const normalizedPagePath = kind === 'pages' && metadata.homepage !== true ? normalizePagePath(rawSlug, file) : '';
+    const slug = slugify(String(rawSlug).split('/').pop());
+    const date = normalizeDate(metadata.date, bundleName, kind, file, config.site?.timeZone);
+    const calendar = metadata.date == null ? (bundleName.match(/^(\d{4}-\d{2}-\d{2})-/)?.[1] || '1970-01-01') : publicationCalendar(metadata.date,date,config.site?.timeZone);
+    if (metadata.showChanges !== undefined && typeof metadata.showChanges !== 'boolean') throw new Error('showChanges must be a boolean in ' + file);
     const revision = kind === 'posts' ? await readPostRevision(file, source, metadata.showChanges !== false, resolve(root,'assets')) : {updated:null,changes:''};
-    let path;
-    if (kind === 'posts') {
-      path = config.permalink
-        .replace(/:year/g, calendar.slice(0,4))
-        .replace(/:month/g, calendar.slice(5,7))
-        .replace(/:day/g, calendar.slice(8,10))
-        .replace(/:slug/g, slug)
-        .replace(/:title/g, slug)
-        .replace(/^\/+|\/+$/g, '') + '/';
-    } else {
-      const localePrefix = locale === config.i18n.defaultLocale ? '' : locale + '/';
-      path = metadata.homepage === true ? localePrefix : normalizedPagePath + '/';
-    }
-    if (locale !== config.i18n.defaultLocale && metadata.homepage !== true) path = locale + '/' + path;
-    return {
-      kind, file, relativePath, bundlePath, title, slug, date, locale,
-      dateOnly: metadata.date == null || /^\d{4}-\d{2}-\d{2}$/.test(String(metadata.date)),
+    let path;
+    if (kind === 'posts') {
+      path = config.permalink
+        .replace(/:year/g, calendar.slice(0,4))
+        .replace(/:month/g, calendar.slice(5,7))
+        .replace(/:day/g, calendar.slice(8,10))
+        .replace(/:slug/g, slug)
+        .replace(/:title/g, slug)
+        .replace(/^\/+|\/+$/g, '') + '/';
+    } else {
+      const localePrefix = locale === config.i18n.defaultLocale ? '' : locale + '/';
+      path = metadata.homepage === true ? localePrefix : normalizedPagePath + '/';
+    }
+    if (locale !== config.i18n.defaultLocale && metadata.homepage !== true) path = locale + '/' + path;
+    return {
+      kind, file, relativePath, bundlePath, title, slug, date, locale,
+      dateOnly: metadata.date == null || /^\d{4}-\d{2}-\d{2}$/.test(String(metadata.date)),
       updated: revision.updated, changes: revision.changes, showChanges: metadata.showChanges !== false,
       revisionImages: revision.revisionImages, revisionAssets: revision.revisionAssets??[],
-      author: kind === 'posts' ? normalizeAuthor(metadata.author, file) : '',
-      authorAvatar: safeAvatar(metadata.authorAvatar ?? (typeof metadata.author === 'object' && metadata.author !== null ? metadata.author.avatar : undefined), 'author avatar in ' + file),
-      category: normalizeCategory(metadata.category),
+      author: kind === 'posts' ? normalizeAuthor(metadata.author, file) : '',
+      authorAvatar: safeAvatar(metadata.authorAvatar ?? (typeof metadata.author === 'object' && metadata.author !== null ? metadata.author.avatar : undefined), 'author avatar in ' + file),
+      category: normalizeCategory(metadata.category),
       pinned: kind === 'posts' && metadata.pinned === true,
-      readingMinutes: kind === 'posts' ? readingMinutes(markdown) : 0,
-      videoId: (kind === 'posts' ? 'post-' : 'page-') + slugify(bundlePath + '-' + locale.toLowerCase()),
-      video: kind === 'posts' ? normalizeVideo(metadata.video, file) : null,
-      tags: normalizeTags(metadata.tags),
-      description: String(metadata.description ?? ''),
-      keywords: normalizeTags(metadata.keywords),
-      robots: typeof metadata.robots === 'string' ? metadata.robots : '',
-      image: typeof metadata.image === 'string' ? metadata.image : '',
-      homepage: metadata.homepage === true,
-      blocks: metadata.blocks ?? [],
-      draft: metadata.draft === true,
-      path,
-      markdown: markdown.trim()
-    };
-  });
-}
+      readingMinutes: kind === 'posts' ? readingMinutes(markdown) : 0,
+      videoId: (kind === 'posts' ? 'post-' : 'page-') + slugify(bundlePath + '-' + locale.toLowerCase()),
+      video: kind === 'posts' ? normalizeVideo(metadata.video, file) : null,
+      tags: normalizeTags(metadata.tags),
+      description: String(metadata.description ?? ''),
+      keywords: normalizeTags(metadata.keywords),
+      robots: typeof metadata.robots === 'string' ? metadata.robots : '',
+      image: typeof metadata.image === 'string' ? metadata.image : '',
+      homepage: metadata.homepage === true,
+      blocks: metadata.blocks ?? [],
+      draft: metadata.draft === true,
+      path,
+      markdown: markdown.trim()
+    };
+  });
+}

package/src/data-saver.js

@@ -84,7 +84,7 @@ function featureFor(source) {
 
 function mediaLabel(node) {
   const attributes = node.attribs || {};
-  const label = attributes.alt || attributes.title || attributes['data-document-title'];
+  const label = attributes.alt || attributes.title || attributes['aria-label'] || attributes['data-document-title'];
   if (label) return label;
   for (const child of node.children || []) {
     if (['template', 'noscript'].includes(child.name)) continue;
@@ -146,7 +146,7 @@ export function dataSaverHtml(html, config, manifest = {}) {
       patches.push({ start: node.startIndex, end: node.endIndex + 1, text: '<template data-edgepress-data-resource="' + resource + '" data-data-feature="' + (core ? 'core' : featureFor(attributes.src || attributes.href || '')) + '">' + original + '</template><noscript>' + original + '</noscript>' });
       return;
     }
-    if (['img', 'picture', 'video', 'audio', 'iframe'].includes(name) || attributes['data-edgepress-document'] !== undefined || attributes['data-edgepress-media-viewer'] !== undefined || attributes['data-project-demo'] !== undefined) {
+    if (['img', 'picture', 'video', 'audio', 'iframe'].includes(name) || attributes['data-edgepress-document'] !== undefined || attributes['data-edgepress-media-viewer'] !== undefined || attributes['data-edgepress-video'] !== undefined || attributes['data-project-demo'] !== undefined) {
       const candidate = name === 'picture' ? node.children?.find(child => child.name === 'img')?.attribs : name === 'img' ? attributes : null;
       if (!firstImage && candidate?.fetchpriority === 'high') {
         const source = name === 'picture' ? node.children?.find(child => child.name === 'source')?.attribs : null;
@@ -157,7 +157,7 @@ export function dataSaverHtml(html, config, manifest = {}) {
       }
       const label = mediaLabel(node);
       const tag = name === 'img' || name === 'picture' ? 'span' : 'div';
-      const feature = attributes['data-edgepress-document'] !== undefined ? 'document' : attributes['data-edgepress-media-viewer'] !== undefined ? 'gallery' : attributes['data-project-demo'] !== undefined ? 'demo' : name === 'img' || name === 'picture' ? 'image' : 'media';
+      const feature = attributes['data-edgepress-document'] !== undefined ? 'document' : attributes['data-edgepress-media-viewer'] !== undefined || attributes['data-edgepress-video'] !== undefined ? 'gallery' : attributes['data-project-demo'] !== undefined ? 'demo' : name === 'img' || name === 'picture' ? 'image' : 'media';
       const classes = attributes.class || '';
       const pictureImage = name === 'picture' ? node.children?.find(child => child.name === 'img')?.attribs : null;
       const decorative = feature === 'image' && (attributes.alt === '' || pictureImage?.alt === '' || attributes['aria-hidden'] === 'true' || ['none', 'presentation'].includes(attributes.role) || /(?:^|\s)(?:navigation-icon|icon-library|brand-mark)(?:\s|$)/.test(classes));