blume 2.0.2 → 2.1.0

package/dist/cli/{chunk-5r8g91qn.js → chunk-43zcf4gz.js}

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 import {
+  resolveFallbackLocale,
+  localizeRoute,
+  localizeInternalPath,
+  i18nDiagnostics,
   blumeReferences,
   frontmatter_default,
   resolveDocsCollection,
@@ -12,21 +16,23 @@ import {
   pollingWatch,
   snapshotCache,
   loadWithCache,
-  resolveFallbackLocale,
-  localizeRoute,
-  localizeInternalPath,
-  i18nDiagnostics,
+  MDX_BODY_FEATURES,
   normalizeRef,
   isPageRef,
   pagesByRef,
   buildNavigation,
   PUBLIC_API_URL,
+  pathsUnderPattern,
+  hasVariables,
+  substituteVariables,
+  undefinedVariables,
   pageMetaSchema,
   folderMetaSchema,
   versionizeRoute,
   versionsDiagnostics,
   slugify,
   slugifyPath,
+  unloadablePathDiagnostic,
   extractHeadings,
   strippedLineOffset,
   isStringValue,
@@ -42,7 +48,7 @@ import {
   guardBlockStart,
   renderInline,
   destination,
-  renderLink,
+  linkParts,
   headingPrefix,
   blockquote,
   listItem,
@@ -57,15 +63,17 @@ import {
   neutralizeUnsafeLinks,
   columnsPrefix,
   openApiSource,
-  BLUME_IGNORE_DIRS,
-  baselineScanIgnore,
-  BLUME_WATCH_IGNORE_DIRS,
-  excludeDirSegments,
-  ignoringWatchListener,
+  isJsonObject,
+  getPath,
+  isStringValue2,
+  asString,
+  asObject,
+  asNumber,
+  objectsIn,
   createModuleLoader,
   resolveProjectContext,
   loadConfig
-} from "./chunk-v6ya5kcb.js";
+} from "./chunk-xkz5xbtv.js";
 import {
   getBlumeVersion,
   BlumeError,
@@ -76,7 +84,14 @@ import {
   isInternalPath,
   withBasePath,
   mountBasePath
-} from "./chunk-gs7r695n.js";
+} from "./chunk-zccbjcj0.js";
+import {
+  BLUME_IGNORE_DIRS,
+  baselineScanIgnore,
+  BLUME_WATCH_IGNORE_DIRS,
+  excludeDirSegments,
+  ignoringWatchListener
+} from "./chunk-kwrg63tm.js";
 
 // src/core/manifest.ts
 var versionAlternateKey = (versionKey, locale) => `${versionKey}\x00${locale}`;
@@ -203,6 +218,112 @@ var buildManifest = (options) => {
 // src/core/project-graph.ts
 import { isAbsolute as isAbsolute3, relative as relative5 } from "pathe";
 
+// src/core/directive-diagnostics.ts
+import { mdxToMdast } from "satteri";
+
+// src/markdown/directives.ts
+import { toString as mdastToString } from "mdast-util-to-string";
+var CALLOUT_TYPES = new Set([
+  "danger",
+  "info",
+  "note",
+  "success",
+  "tip",
+  "warning"
+]);
+var CALLOUT_ALIASES = {
+  caution: "warning",
+  error: "danger",
+  important: "note",
+  warn: "warning"
+};
+var calloutTypeFor = (name) => {
+  const lower = name.toLowerCase();
+  if (CALLOUT_TYPES.has(lower)) {
+    return lower;
+  }
+  return CALLOUT_ALIASES[lower] ?? null;
+};
+var LITERAL_MARKERS = new Map([
+  ["leafDirective", "::"],
+  ["textDirective", ":"]
+]);
+var labelSource = (label) => label.length > 0 ? `[${mdastToString(label, { includeImageAlt: false })}]` : "";
+var attributeSource = (node) => {
+  const attributes = Object.entries(node.attributes ?? {}).map(([key, value]) => value ? `${key}="${value}"` : key);
+  return attributes.length > 0 ? `{${attributes.join(" ")}}` : "";
+};
+var spannedSource = (node, source) => {
+  const start = node.position?.start?.offset;
+  const end = node.position?.end?.offset;
+  return start !== undefined && end !== undefined ? source.slice(start, end) : null;
+};
+var directiveSource = (node, marker, source) => {
+  const opening = `${marker}${node.name}`;
+  const slice = spannedSource(node, source);
+  if (slice?.startsWith(opening)) {
+    return slice;
+  }
+  return `${opening}${labelSource(node.children ?? [])}${attributeSource(node)}`;
+};
+
+// src/core/directive-diagnostics.ts
+var CONTAINER_OPENING = /^[\t >]*:{3,}(?<name>[a-z][\w-]*)/gimu;
+var codeList = (names) => [...names].map((name) => `\`${name}\``).join(", ");
+var CALLOUT_NAMES = `${codeList(CALLOUT_TYPES)} (or the aliases ${codeList(Object.keys(CALLOUT_ALIASES))})`;
+var unknownContainers = (text) => {
+  const named = [...text.matchAll(CONTAINER_OPENING)].some((match) => calloutTypeFor(match.groups?.name ?? "") === null);
+  if (!named) {
+    return [];
+  }
+  let tree;
+  try {
+    tree = mdxToMdast(text, { features: MDX_BODY_FEATURES });
+  } catch {
+    return [];
+  }
+  const found = [];
+  const walk = (node) => {
+    if (node.type === "containerDirective" && calloutTypeFor(node.name) === null) {
+      found.push({ line: node.position?.start.line ?? 1, name: node.name });
+    }
+    if ("children" in node) {
+      for (const child of node.children) {
+        walk(child);
+      }
+    }
+  };
+  walk(tree);
+  return found;
+};
+var unknownDirectiveDiagnostics = (entry, sourceName) => {
+  if (entry.body.format !== "mdx") {
+    return [];
+  }
+  const page = entry.sourcePath ?? `${sourceName}:${entry.ref}`;
+  const offset = entry.bodyLineOffset ?? strippedLineOffset(entry.raw, entry.body.text);
+  return unknownContainers(entry.expanded?.text ?? entry.body.text).map(({ line, name }) => {
+    const origin = entry.expanded?.origins[line - 1];
+    return {
+      code: "BLUME_UNKNOWN_DIRECTIVE",
+      file: origin?.file ?? page,
+      line: origin?.line ?? line + offset,
+      message: `\`:::${name}\` isn't a callout type, so the page shows its \`:::\` lines as written around its content.`,
+      severity: "warning",
+      suggestion: `Use a callout type — ${CALLOUT_NAMES} — or remove the \`:::\` lines to keep the content as plain prose.`
+    };
+  });
+};
+
+// src/core/localizable.ts
+var isSingleLabel = (label) => typeof label === "string";
+var resolveLocalizable = (label, locale, defaultLocale) => {
+  if (isSingleLabel(label)) {
+    return label;
+  }
+  return (locale === undefined ? undefined : label[locale]) ?? (defaultLocale === undefined ? undefined : label[defaultLocale]) ?? Object.values(label)[0] ?? "";
+};
+
 // src/theme/icon-kind.ts
 var IMAGE_ICON = /^(?:https?:\/\/|data:image\/|\/|\.{1,2}\/)|\.(?:avif|gif|jpe?g|png|svg|webp)$/iu;
 var INLINE_SVG = /^\s*<svg[\s\S]*<\/svg>\s*$/u;
@@ -467,13 +588,6 @@ var localePagesFor = (code, real, fallback, fallbackByKey, i18n, basePath) => {
   }
   return [...real, ...filled];
 };
-var isSingleLabel = (label) => typeof label === "string";
-var resolveLabel = (label, locale, defaultLocale) => {
-  if (isSingleLabel(label)) {
-    return label;
-  }
-  return label[locale] ?? (defaultLocale === undefined ? undefined : label[defaultLocale]) ?? Object.values(label)[0] ?? "";
-};
 var localizeSidebarHrefs = (items, localize) => items.map((item) => {
   if (isPageRef(item)) {
     return item;
@@ -491,10 +605,19 @@ var resolveTabLabels = (tabs, locale, defaultLocale) => (tabs ?? []).map((tab) =
   ...tab,
   items: tab.items?.map((item) => ({
     ...item,
-    label: resolveLabel(item.label, locale, defaultLocale)
+    label: resolveLocalizable(item.label, locale, defaultLocale)
   })),
-  label: resolveLabel(tab.label, locale, defaultLocale)
+  label: resolveLocalizable(tab.label, locale, defaultLocale)
 }));
+var withLabel = (link, locale, defaultLocale) => ({
+  ...link,
+  label: resolveLocalizable(link.label, locale, defaultLocale)
+});
+var resolveHeaderLinks = (navigation, locale, defaultLocale) => ({
+  actions: navigation.actions.map((link) => withLabel(link, locale, defaultLocale)),
+  cta: navigation.cta ? withLabel(navigation.cta, locale, defaultLocale) : null,
+  featured: navigation.featured.map((link) => withLabel(link, locale, defaultLocale))
+});
 var mountConfiguredLink = (path, basePath, extraRoutes) => extraRoutes.has(path) ? path : withBasePath(basePath, path);
 var buildLocaleNavigation = (code, pages, fallback, fallbackByKey, options, i18n, diagnostics, version = "") => {
   const basePath = options.basePath ?? "";
@@ -538,17 +661,17 @@ var buildLocaleNavigation = (code, pages, fallback, fallbackByKey, options, i18n
     ...item,
     href: localizeServed(item.href, false)
   });
-  const { actions, cta, featured } = options.navigation;
+  const { actions, cta, featured } = resolveHeaderLinks(options.navigation, code, i18n.defaultLocale);
   const sidebarItems = options.navigation.sidebar.items;
   const navigation = buildNavigation(localePages, {
-    actions: actions?.map(localizeHref),
+    actions: actions.map(localizeHref),
     basePath,
     cta: cta ? localizeHref(cta) : null,
     diagnostics,
     display: options.navigation.sidebar.display,
     extraRoutes: options.extraRoutes,
     fallbackMetaPrefix,
-    featured: featured?.map(localizeHref),
+    featured: featured.map(localizeHref),
     folderMeta: options.folderMeta,
     localizedRoot: localizeRoute(versionizeRoute("/", version), code, i18n),
     metaPrefix: [version, localeDir].filter(Boolean).join("/"),
@@ -610,13 +733,11 @@ var buildVersionNavigation = (id, versionPages, options, diagnostics) => {
   }
   return {
     "": buildNavigation(versionPages, {
-      actions: options.navigation.actions,
+      ...resolveHeaderLinks(options.navigation, ""),
       basePath: options.basePath ?? "",
-      cta: options.navigation.cta,
       diagnostics,
       display: options.navigation.sidebar.display,
       extraRoutes: options.extraRoutes,
-      featured: options.navigation.featured,
       folderMeta: options.folderMeta,
       localizedRoot: versionizeRoute("/", id),
       metaPrefix: id,
@@ -638,13 +759,11 @@ var buildContentGraph = (pages, options) => {
     ({ navigation, navigationByLocale } = buildI18nNavigation(currentPages, options, i18n, diagnostics));
   } else {
     navigation = buildNavigation(currentPages, {
-      actions: options.navigation.actions,
+      ...resolveHeaderLinks(options.navigation, ""),
       basePath: options.basePath ?? "",
-      cta: options.navigation.cta,
       diagnostics,
       display: options.navigation.sidebar.display,
       extraRoutes: options.extraRoutes,
-      featured: options.navigation.featured,
       folderMeta: options.folderMeta,
       selectors: options.navigation.selectors,
       sharedFolderMeta: options.sharedFolderMeta,
@@ -681,7 +800,8 @@ var buildContentGraph = (pages, options) => {
 
 // src/core/last-modified.ts
 import { execFileSync } from "node:child_process";
-import { relative } from "pathe";
+import { realpathSync } from "node:fs";
+import { normalize as normalize2, relative } from "pathe";
 var GIT_LOCATION_VARS = new Set([
   "GIT_COMMON_DIR",
   "GIT_DIR",
@@ -705,6 +825,13 @@ var parseGitLog = (output) => {
   }
   return times;
 };
+var realPath = (path) => {
+  try {
+    return normalize2(realpathSync.native(path));
+  } catch {
+    return path;
+  }
+};
 var gitRepositoryRoot = (root) => {
   try {
     return execFileSync("git", ["-C", root, "rev-parse", "--show-toplevel"], { encoding: "utf-8", env: gitEnv(), stdio: ["ignore", "pipe", "ignore"] }).trim();
@@ -720,6 +847,7 @@ var gitLastModifiedTimes = (root, contentRoots, sourcePaths, repositoryRoot) =>
   if (gitRoot === null) {
     return new Map;
   }
+  const top = realPath(gitRoot);
   try {
     const output = execFileSync("git", [
       "-C",
@@ -730,12 +858,12 @@ var gitLastModifiedTimes = (root, contentRoots, sourcePaths, repositoryRoot) =>
       "--format=%x00%cI",
       "--name-only",
       "--",
-      ...contentRoots
+      ...contentRoots.map(realPath)
     ], { encoding: "utf-8", env: gitEnv(), maxBuffer: 256 * 1024 * 1024 });
     const byRepoPath = parseGitLog(output);
     const result = new Map;
     for (const sourcePath of sourcePaths) {
-      const iso = byRepoPath.get(relative(gitRoot, sourcePath));
+      const iso = byRepoPath.get(relative(top, realPath(sourcePath)));
       if (iso) {
         result.set(sourcePath, iso);
       }
@@ -797,6 +925,20 @@ var globBase = (pattern) => {
 };
 var onPathOf = (dir, base) => dir === base || base === "" || dir === "" || dir.startsWith(`${base}/`) || base.startsWith(`${dir}/`);
 var withinInclude = (dir, include) => include === undefined || include.some((pattern) => !pattern.startsWith("!") && onPathOf(dir, globBase(pattern)));
+var findFolderMetaFiles = async (source, patterns = META_FILES) => {
+  const found = await glob([...patterns], {
+    absolute: true,
+    cwd: source.root,
+    ignore: [
+      ...source.exclude ?? [],
+      "**/node_modules/**",
+      "**/.blume/**",
+      "**/dist/**"
+    ],
+    onlyFiles: true
+  });
+  return found.filter((file) => withinInclude(relative2(source.root, dirname(file)), source.include));
+};
 var metaKeyFor = (prefix, dir) => {
   const clean = prefix ? trimChar(prefix, "/") : "";
   if (!clean) {
@@ -813,18 +955,7 @@ var discoverFolderMeta = async (sources, options = {}) => {
   const shared = new Map;
   const diagnostics = [];
   const perSource = await Promise.all(list.map(async (source) => {
-    const found = await glob(META_FILES, {
-      absolute: true,
-      cwd: source.root,
-      ignore: [
-        ...source.exclude ?? [],
-        "**/node_modules/**",
-        "**/.blume/**",
-        "**/dist/**"
-      ],
-      onlyFiles: true
-    });
-    const files = found.filter((file) => withinInclude(relative2(source.root, dirname(file)), source.include));
+    const files = await findFolderMetaFiles(source);
     const loaded = await Promise.all(files.map(async (file) => {
       try {
         return {
@@ -875,30 +1006,6 @@ var discoverFolderMeta = async (sources, options = {}) => {
 // src/core/sources/resolve.ts
 import { join as join7 } from "pathe";
 
-// src/core/sources/json.ts
-var isJsonObject = (value) => typeof value === "object" && value !== null;
-var getPath = (doc, path) => {
-  let current = doc;
-  for (const key of path.split(".")) {
-    if (isJsonObject(current)) {
-      current = current[key];
-    } else {
-      return;
-    }
-  }
-  return current;
-};
-var isStringValue2 = (value) => typeof value === "string";
-var asString = (value) => isStringValue2(value) ? value : undefined;
-var asArray = (value) => Array.isArray(value) ? value : [];
-var asObject = (value) => isJsonObject(value) && !Array.isArray(value) ? value : undefined;
-var isNumberValue = (value) => typeof value === "number";
-var asNumber = (value) => isNumberValue(value) ? value : undefined;
-var objectsIn = (value) => asArray(value).flatMap((item) => {
-  const object = asObject(item);
-  return object ? [object] : [];
-});
-
 // src/core/sources/contentful-rich-text.ts
 var HEADING = /^heading-(?<level>[1-6])$/u;
 var CELL_PIPE = /\|/gu;
@@ -965,30 +1072,31 @@ var embeddedEntry = (node, options) => {
   }
   return unsupported(`Contentful embedded entry${contentType ? `: ${contentType}` : ""}`, writesMdx(options.serializers));
 };
-var renderInlines = (nodes, options) => nodes.map((node) => renderInlineNode(node, options)).join("");
-var renderInlineNode = (node, options) => {
+var inlineParts = (nodes, options) => nodes.flatMap((node) => inlineNodeParts(node, options));
+var inlineNodeParts = (node, options) => {
   switch (asString(node.nodeType)) {
     case "text": {
-      return renderInline(asString(node.value) ?? "", marksOf(node));
+      return [{ marks: marksOf(node), text: asString(node.value) ?? "" }];
     }
     case "hyperlink": {
-      return renderLink(renderInlines(children(node), options), asString(getPath(node, "data.uri")));
+      return linkParts(inlineParts(children(node), options), asString(getPath(node, "data.uri")));
     }
     case "asset-hyperlink": {
-      return renderLink(renderInlines(children(node), options), linkedAsset(node, options)?.url);
+      return linkParts(inlineParts(children(node), options), linkedAsset(node, options)?.url);
     }
     case "embedded-entry-inline": {
-      return embeddedEntry(node, options);
+      return [{ markdown: embeddedEntry(node, options) }];
     }
     default: {
-      return renderInlines(children(node), options);
+      return inlineParts(children(node), options);
     }
   }
 };
+var blockText = (node, options) => guardBlockStart(renderInline(inlineParts(children(node), options)));
 var renderList = (items, marker, options) => items.map((item, index) => listItem(marker(index), children(item).map((child) => renderBlock(child, options)).filter((block) => block !== "").join(`
 `))).join(`
 `);
-var cellText = (cell, options) => children(cell).map((paragraph) => renderInlines(children(paragraph), options)).join(" ").replaceAll(CELL_BREAK, " ").replaceAll(CELL_PIPE, String.raw`\|`);
+var cellText = (cell, options) => children(cell).map((paragraph) => blockText(paragraph, options)).join(" ").replaceAll(CELL_BREAK, " ").replaceAll(CELL_PIPE, String.raw`\|`);
 var tableRow = (cells) => `| ${cells.join(" | ")} |`;
 var renderTable = (node, options) => {
   const rows = children(node).map((row) => children(row).map((cell) => cellText(cell, options)));
@@ -1007,11 +1115,11 @@ var renderBlock = (node, options) => {
   const type = asString(node.nodeType) ?? "";
   const heading = HEADING.exec(type)?.groups?.level;
   if (heading) {
-    return `${headingPrefix(Number(heading))}${guardBlockStart(renderInlines(children(node), options))}`;
+    return `${headingPrefix(Number(heading))}${blockText(node, options)}`;
   }
   switch (type) {
     case "paragraph": {
-      return guardBlockStart(renderInlines(children(node), options));
+      return blockText(node, options);
     }
     case "blockquote": {
       return blockquote(joinBlocks(children(node).map((child) => renderBlock(child, options))));
@@ -1230,7 +1338,17 @@ var filesystemSource = (options) => {
       onlyFiles: true
     });
     files.sort();
-    const entries = await Promise.all(files.map(async (file) => {
+    const diagnostics = [];
+    const loadable = [];
+    for (const file of files) {
+      const unloadable = unloadablePathDiagnostic(relative3(contentRoot, file), file);
+      if (unloadable) {
+        diagnostics.push(unloadable);
+      } else {
+        loadable.push(file);
+      }
+    }
+    const entries = await Promise.all(loadable.map(async (file) => {
       const source = await readFile(file, "utf-8");
       const ext = extname(file).toLowerCase();
       const format = ext === ".mdx" ? "mdx" : "md";
@@ -1243,7 +1361,7 @@ var filesystemSource = (options) => {
         sourcePath: file
       };
     }));
-    return { diagnostics: [], entries };
+    return { diagnostics, entries };
   };
   const validate = () => {
     if (!existsSync(contentRoot)) {
@@ -1284,7 +1402,7 @@ var filesystemSource = (options) => {
 // src/core/sources/github-releases.ts
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { gfmFromMarkdown } from "mdast-util-gfm";
-import { toString as mdastToString } from "mdast-util-to-string";
+import { toString as mdastToString2 } from "mdast-util-to-string";
 import { gfm } from "micromark-extension-gfm";
 import stringWidth from "string-width";
 var DEFAULT_LIMIT = 100;
@@ -1303,7 +1421,7 @@ var releaseDescription = (body) => {
     extensions: [gfm()],
     mdastExtensions: [gfmFromMarkdown()]
   });
-  const text = tree.children.filter((node) => !NON_PROSE.has(node.type)).map((node) => mdastToString(node, { includeHtml: false, includeImageAlt: false })).join(" ").replaceAll(WHITESPACE, " ").trim();
+  const text = tree.children.filter((node) => !NON_PROSE.has(node.type)).map((node) => mdastToString2(node, { includeHtml: false, includeImageAlt: false })).join(" ").replaceAll(WHITESPACE, " ").trim();
   if (!text) {
     return;
   }
@@ -1357,7 +1475,7 @@ var rewrittenLink = (markdown, node, path) => {
   }
   const start = node.position?.start.offset ?? 0;
   if (markdown[start] !== "[") {
-    return `[${escapeMarkdownText(mdastToString(node))}](${target})`;
+    return `[${escapeMarkdownText(mdastToString2(node))}](${target})`;
   }
   const first = node.children.at(0)?.position?.start.offset ?? start + 1;
   const last = node.children.at(-1)?.position?.end.offset ?? first;
@@ -1449,11 +1567,21 @@ var githubReleasesSource = (options, ctx) => {
   const include = (release) => (options.drafts || !release.draft) && (options.prereleases || !release.prerelease);
   const fetchPage = async (page) => {
     const url = `${base}/repos/${options.owner}/${options.repo}/releases?per_page=${PER_PAGE}&page=${page}`;
-    const res = await doFetch(url, { headers: githubHeaders() });
-    if (!res.ok) {
-      throw new Error(`${url} -> ${res.status}`);
+    try {
+      const res = await doFetch(url, {
+        headers: githubHeaders(),
+        signal: AbortSignal.timeout(REMOTE_TIMEOUT_MS)
+      });
+      if (!res.ok) {
+        throw new Error(`${url} -> ${res.status}`);
+      }
+      return await res.json();
+    } catch (error) {
+      if (error instanceof DOMException && error.name === "TimeoutError") {
+        throw new Error(`${url} did not respond within ${REMOTE_TIMEOUT_MS / 1000}s`, { cause: error });
+      }
+      throw error;
     }
-    return await res.json();
   };
   const fetchReleases = async () => {
     const collected = [];
@@ -1527,15 +1655,29 @@ var githubHeaders2 = (url) => {
   }
   return GITHUB_HOSTS.has(host) ? { authorization: `Bearer ${token}` } : {};
 };
+var fetchText = async (url, doFetch) => {
+  try {
+    const res = await doFetch(url, {
+      headers: githubHeaders2(url),
+      signal: AbortSignal.timeout(REMOTE_TIMEOUT_MS)
+    });
+    if (!res.ok) {
+      throw new Error(`${url} -> ${res.status}`);
+    }
+    return await res.text();
+  } catch (error) {
+    if (error instanceof DOMException && error.name === "TimeoutError") {
+      throw new Error(`${url} did not respond within ${REMOTE_TIMEOUT_MS / 1000}s`, { cause: error });
+    }
+    throw error;
+  }
+};
 var enumerateGithub = async (github, include, doFetch) => {
   const { owner, repo, ref } = github;
   const base = github.path.replaceAll(/^\/|\/$/gu, "");
   const treeUrl = `https://api.github.com/repos/${owner}/${repo}/git/trees/${ref}?recursive=1`;
-  const res = await doFetch(treeUrl, { headers: githubHeaders2(treeUrl) });
-  if (!res.ok) {
-    throw new Error(`${treeUrl} -> ${res.status}`);
-  }
-  const body = await res.json();
+  const text = await fetchText(treeUrl, doFetch);
+  const body = JSON.parse(text);
   const prefix = base ? `${base}/` : "";
   const included = picomatch(include);
   const refs = (body.tree ?? []).flatMap((node) => {
@@ -1580,13 +1722,7 @@ var mdxRemoteSource = (options, ctx) => {
     return { refs, truncated: false };
   };
   const fetchEntry = async (item) => {
-    const res = await doFetch(item.fetchUrl, {
-      headers: githubHeaders2(item.fetchUrl)
-    });
-    if (!res.ok) {
-      throw new Error(`${item.fetchUrl} -> ${res.status}`);
-    }
-    const text = await res.text();
+    const text = await fetchText(item.fetchUrl, doFetch);
     const parsed = frontmatter_default(text);
     const format = item.ref.toLowerCase().endsWith(".mdx") ? "mdx" : "md";
     return {
@@ -1610,13 +1746,16 @@ var mdxRemoteSource = (options, ctx) => {
           severity: "warning"
         });
       }
+      const reasons = [];
       const settled = await Promise.all(refs.map(async (ref) => {
         try {
           return await fetchEntry(ref);
         } catch (error) {
+          const reason = error.message;
+          reasons.push(reason);
           skipped.push({
             code: "BLUME_SOURCE_FETCH_FAILED",
-            message: `Source "${options.name}" skipped "${ref.ref}" (${error.message}); the rest were imported.`,
+            message: `Source "${options.name}" skipped "${ref.ref}" (${reason}); the rest were imported.`,
             severity: "warning"
           });
           return null;
@@ -1625,7 +1764,7 @@ var mdxRemoteSource = (options, ctx) => {
       const entries = settled.filter((entry) => entry !== null);
       if (refs.length > 0 && entries.length === 0) {
         skipped.length = 0;
-        throw new Error(`all ${refs.length} remote file(s) failed to fetch`);
+        throw new Error(`all ${refs.length} remote file(s) failed to fetch (${reasons[0]})`);
       }
       return entries;
     }, refresh);
@@ -1647,6 +1786,7 @@ var mdxRemoteSource = (options, ctx) => {
   return {
     load,
     name: options.name,
+    orderedNames: true,
     prefix: options.prefix,
     read,
     staged: true,
@@ -1825,12 +1965,27 @@ var materializeAssets = async (markdown, ctx) => {
 };
 
 // src/core/sources/notion.ts
-var richToMarkdown = (rich = []) => rich.map(({ annotations = {}, href, plain_text: text }) => renderLink(renderInline(text, {
-  bold: annotations.bold,
-  code: annotations.code,
-  italic: annotations.italic,
-  strike: annotations.strikethrough
-}), href ?? undefined)).join("");
+var richToMarkdown = (rich = []) => {
+  const linked = [];
+  for (const { annotations = {}, href, plain_text: text } of rich) {
+    const run = {
+      marks: {
+        bold: annotations.bold,
+        code: annotations.code,
+        italic: annotations.italic,
+        strike: annotations.strikethrough
+      },
+      text
+    };
+    const last = linked.at(-1);
+    if (last && last.href === (href ?? undefined)) {
+      last.runs.push(run);
+    } else {
+      linked.push({ href: href ?? undefined, runs: [run] });
+    }
+  }
+  return renderInline(linked.flatMap(({ href, runs }) => linkParts(runs, href)));
+};
 var isBlockPayload = (value) => typeof value === "object";
 var payloadOf = (block) => {
   const value = block[block.type];
@@ -1884,7 +2039,7 @@ var renderVideo = (data) => {
   }
   const caption = richToMarkdown(data.caption);
   const title = caption ? ` title=${jsxString(richToPlain(data.caption))}` : "";
-  const media = isYouTubeUrl(url) ? `<YouTube${title} url=${JSON.stringify(url)} />` : `<video controls src=${JSON.stringify(url)} />`;
+  const media = isYouTubeUrl(url) ? `<YouTube${title} url=${jsxString(url)} />` : `<video controls src="${url.replaceAll('"', "%22")}" />`;
   return caption ? `<Frame caption=${jsxString(caption.replaceAll(FRAME_ESCAPED, ""))}>
 ${media}
 </Frame>` : media;
@@ -2074,7 +2229,7 @@ ${nested}`;
       data.sidebar = { order };
     }
     const slugProp = richToPlain(page.properties[props.slug ?? "Slug"]?.rich_text);
-    const slug = slugifyPath(slugProp || title) || page.id;
+    const slug = (slugProp ? slugifyPath(slugProp) : slugify(title.replaceAll("/", "-"))) || page.id;
     return { data, slug };
   };
   const toEntry = async (client, page) => {
@@ -2567,14 +2722,26 @@ var obsidianSource = (options, ctx) => {
   const vaultDir = resolve2(ctx.projectRoot, options.vault);
   const exclude = new Set([...BLUME_IGNORE_DIRS, ...options.exclude ?? []]);
   const load = async () => {
-    const files = await walkVault(vaultDir, vaultDir, exclude);
+    const skipped = [];
+    const files = [];
+    for (const rel of await walkVault(vaultDir, vaultDir, exclude)) {
+      const unloadable = unloadablePathDiagnostic(rel, join5(vaultDir, rel));
+      if (unloadable) {
+        skipped.push(unloadable);
+      } else {
+        files.push(rel);
+      }
+    }
     const read = await Promise.all(files.map((rel) => readNote(vaultDir, rel, options)));
     const notes = read.filter((note) => note !== null);
     const { index, pairs } = buildLinkIndex(notes, options);
     const unresolved = noTargets();
     const entries = pairs.map((pair) => noteToEntry(pair, index, options, unresolved));
     return {
-      diagnostics: unresolvedDiagnostics(options.name, unresolved),
+      diagnostics: [
+        ...skipped,
+        ...unresolvedDiagnostics(options.name, unresolved)
+      ],
       entries
     };
   };
@@ -2652,32 +2819,33 @@ var customBlock = (node, options) => {
   }
   return unsupported(`Lexical block${blockType ? `: ${blockType}` : ""}`, writesMdx(options.serializers));
 };
-var renderInlines2 = (nodes, options) => nodes.map((node) => renderInlineNode2(node, options)).join("");
-var renderInlineNode2 = (node, options) => {
+var inlineParts2 = (nodes, options) => nodes.flatMap((node) => inlineNodeParts2(node, options));
+var inlineNodeParts2 = (node, options) => {
   switch (typeOf(node)) {
     case "text": {
-      return renderInline(asString(node.text) ?? "", marksOf2(node));
+      return [{ marks: marksOf2(node), text: asString(node.text) ?? "" }];
     }
     case "linebreak": {
-      return `
-`;
+      return [{ markdown: `
+` }];
     }
     case "tab": {
-      return "\t";
+      return [{ markdown: "\t" }];
     }
     case "link":
     case "autolink": {
-      return renderLink(renderInlines2(children2(node), options), asString(getPath(node, "fields.url")) ?? asString(node.url));
+      return linkParts(inlineParts2(children2(node), options), asString(getPath(node, "fields.url")) ?? asString(node.url));
     }
     case "inlineBlock": {
-      return customBlock(node, options);
+      return [{ markdown: customBlock(node, options) }];
     }
     default: {
-      return renderInlines2(children2(node), options);
+      return inlineParts2(children2(node), options);
     }
   }
 };
-var blockText = (node, options) => guardBlockStart(renderInlines2(children2(node), options));
+var inlineText = (nodes, options) => guardBlockStart(renderInline(inlineParts2(nodes, options)));
+var blockText2 = (node, options) => inlineText(children2(node), options);
 var renderUpload = (node, options) => {
   const value = asObject(node.value);
   const url = value ? asString(value.url) : undefined;
@@ -2708,7 +2876,7 @@ var renderList2 = (node, options) => {
     if (listType === "check") {
       check = item.checked === true ? "[x] " : "[ ] ";
     }
-    const line = `${check}${guardBlockStart(renderInlines2(inline, options))}`;
+    const line = `${check}${inlineText(inline, options)}`;
     items.push(listItem(lastMarker, sub ? `${line}
 ${sub}` : line));
     index += 1;
@@ -2719,14 +2887,14 @@ ${sub}` : line));
 var renderBlock2 = (node, options) => {
   switch (typeOf(node)) {
     case "paragraph": {
-      return blockText(node, options);
+      return blockText2(node, options);
     }
     case "heading": {
       const level = Number((asString(node.tag) ?? "h1").slice(1));
-      return `${headingPrefix(level)}${blockText(node, options)}`;
+      return `${headingPrefix(level)}${blockText2(node, options)}`;
     }
     case "quote": {
-      return blockquote(blockText(node, options));
+      return blockquote(blockText2(node, options));
     }
     case "list": {
       return renderList2(node, options);
@@ -2825,19 +2993,31 @@ var HEADING_STYLES = new Map([
   ["h5", "##### "],
   ["h6", "###### "]
 ]);
-var renderSpan = (span, defs) => {
+var spanRun = (span) => {
   const marks = span.marks ?? [];
-  const link = marks.map((mark) => defs.get(mark)).findLast((def) => def?._type === "link");
-  return renderLink(renderInline(span.text ?? "", {
-    bold: marks.includes("strong"),
-    code: marks.includes("code"),
-    italic: marks.includes("em"),
-    strike: marks.includes("strike-through")
-  }), link?.href);
+  return {
+    marks: {
+      bold: marks.includes("strong"),
+      code: marks.includes("code"),
+      italic: marks.includes("em"),
+      strike: marks.includes("strike-through")
+    },
+    text: span.text ?? ""
+  };
 };
 var renderChildren = (block) => {
   const defs = new Map((block.markDefs ?? []).map((def) => [def._key, def]));
-  return guardBlockStart((block.children ?? []).map((span) => renderSpan(span, defs)).join(""));
+  const linked = [];
+  for (const span of block.children ?? []) {
+    const link = (span.marks ?? []).map((mark) => defs.get(mark)).findLast((def) => def?._type === "link");
+    const last = linked.at(-1);
+    if (last && last.link === link) {
+      last.runs.push(spanRun(span));
+    } else {
+      linked.push({ link, runs: [spanRun(span)] });
+    }
+  }
+  return guardBlockStart(renderInline(linked.flatMap(({ link, runs }) => linkParts(runs, link?.href))));
 };
 var isAltText = (value) => typeof value === "string";
 var listMarker = (block) => block.listItem === "number" ? "1." : "-";
@@ -2996,31 +3176,36 @@ var sanitySource = (options, ctx) => {
 // src/core/sources/strapi-blocks.ts
 var children3 = (node) => objectsIn(node.children);
 var typeOf2 = (node) => asString(node.type) ?? "";
-var renderInlines3 = (nodes) => nodes.map((node) => renderInlineNode3(node)).join("");
-var renderInlineNode3 = (node) => {
+var inlineParts3 = (nodes) => nodes.flatMap((node) => inlineNodeParts3(node));
+var inlineNodeParts3 = (node) => {
   switch (typeOf2(node)) {
     case "text": {
-      return renderInline(asString(node.text) ?? "", {
-        bold: node.bold === true,
-        code: node.code === true,
-        italic: node.italic === true,
-        strike: node.strikethrough === true
-      });
+      return [
+        {
+          marks: {
+            bold: node.bold === true,
+            code: node.code === true,
+            italic: node.italic === true,
+            strike: node.strikethrough === true
+          },
+          text: asString(node.text) ?? ""
+        }
+      ];
     }
     case "link": {
-      return renderLink(renderInlines3(children3(node)), asString(node.url));
+      return linkParts(inlineParts3(children3(node)), asString(node.url));
     }
     default: {
-      return renderInlines3(children3(node));
+      return inlineParts3(children3(node));
     }
   }
 };
-var blockText2 = (nodes) => guardBlockStart(renderInlines3(nodes));
+var blockText3 = (nodes) => guardBlockStart(renderInline(inlineParts3(nodes)));
 var renderList3 = (node) => {
   const ordered = asString(node.format) === "ordered";
   return children3(node).map((item, index) => {
     const kids = children3(item);
-    const line = blockText2(kids.filter((kid) => typeOf2(kid) !== "list"));
+    const line = blockText3(kids.filter((kid) => typeOf2(kid) !== "list"));
     const sub = kids.filter((kid) => typeOf2(kid) === "list").map((list) => renderList3(list)).join(`
 `);
     const body = sub ? `${line}
@@ -3040,13 +3225,13 @@ var renderImage = (node, options) => {
 var renderBlock4 = (node, options) => {
   switch (typeOf2(node)) {
     case "paragraph": {
-      return blockText2(children3(node));
+      return blockText3(children3(node));
     }
     case "heading": {
-      return `${headingPrefix(asNumber(node.level) ?? 1)}${blockText2(children3(node))}`;
+      return `${headingPrefix(asNumber(node.level) ?? 1)}${blockText3(children3(node))}`;
     }
     case "quote": {
-      return blockquote(blockText2(children3(node)));
+      return blockquote(blockText3(children3(node)));
     }
     case "list": {
       return renderList3(node);
@@ -3317,13 +3502,63 @@ var normalizeLoadedEntries = (loaded, config) => {
       }
       pages.push(...normalized.pages);
       allDiagnostics.push(...normalized.diagnostics);
+      if (normalized.pages.length > 0) {
+        allDiagnostics.push(...unknownDirectiveDiagnostics(entry, source.name));
+      }
     }
   }
   return { diagnostics: allDiagnostics, droppedPages, pages };
 };
+var gitContentRoots = (sources, gitRoot) => {
+  if (gitRoot === null) {
+    return [];
+  }
+  const top = realPath(gitRoot);
+  return sources.flatMap((source) => source.contentRoot ? [source.contentRoot] : []).filter((dir) => isWithin(top, realPath(dir)));
+};
 var isLogoShorthand = (logo) => typeof logo === "string";
 var logoHref = (logo) => logo === undefined || isLogoShorthand(logo) ? "/" : logo.href ?? "/";
 var isBannerShorthand = (banner) => typeof banner === "string";
+var substituteEntryVariables = (entry, variables) => {
+  const { expanded } = entry;
+  const text = expanded?.text ?? entry.body.text;
+  const offset = expanded ? 0 : strippedLineOffset(entry.raw, entry.body.text);
+  const diagnostics = undefinedVariables(text, variables).map(({ line, name }) => {
+    const origin = expanded?.origins[line - 1];
+    return {
+      code: "BLUME_UNDEFINED_VARIABLE",
+      file: origin?.file ?? entry.sourcePath,
+      line: origin?.line ?? line + offset,
+      message: `{{${name}}} isn't a defined variable, so it would show as written.`,
+      severity: "error",
+      suggestion: `Define "${name}" under variables in blume.config.ts, or put it in inline code to show it as written.`
+    };
+  });
+  if (expanded) {
+    expanded.text = substituteVariables(expanded.text, variables);
+  } else {
+    entry.body.text = substituteVariables(entry.body.text, variables);
+  }
+  return diagnostics;
+};
+var substituteLoadedVariables = (loaded, variables) => hasVariables(variables) ? loaded.flatMap(({ entries }) => entries.flatMap((entry) => substituteEntryVariables(entry, variables))) : [];
+var redirectPageDiagnostics = (config, pages, configFile) => config.redirects.flatMap((redirect) => {
+  const matched = pathsUnderPattern(withBasePath(config.basePath, redirect.from), pages);
+  const [first] = matched;
+  if (first === undefined) {
+    return [];
+  }
+  const more = matched.length > 1 ? ` and ${matched.length - 1} more` : "";
+  return [
+    {
+      code: "BLUME_REDIRECT_MATCHES_PAGE",
+      file: configFile ?? undefined,
+      message: `The redirect from ${redirect.from} also matches the page ${first}${more}, which some hosts would redirect and others would serve.`,
+      severity: "error",
+      suggestion: "Narrow the pattern to the paths that moved, or move the pages out from under it."
+    }
+  ];
+});
 var bannerLinkHref = (banner) => banner === undefined || isBannerShorthand(banner) ? undefined : banner.link?.href;
 var scanProject = async (root, options = {}) => {
   const mode = options.mode ?? "dev";
@@ -3377,6 +3612,7 @@ var scanProject = async (root, options = {}) => {
       includeDiagnostics.push(...expansion.errors);
     });
   }));
+  const variableDiagnostics = substituteLoadedVariables(loaded, config.variables);
   const sharedFolderMeta = new Map([
     ...loaded.flatMap(({ folderMeta: sourceMeta }) => Object.entries(sourceMeta ?? {})),
     ...folderMeta.shared
@@ -3392,7 +3628,7 @@ var scanProject = async (root, options = {}) => {
   if (lastModified.enabled && lastModified.source === "git") {
     const fsPaths = pages.map((page) => page.sourcePath).filter((path) => path !== undefined);
     const gitRoot = gitRepositoryRoot(context.root);
-    const contentRoots = sources.flatMap((source) => source.contentRoot ? [source.contentRoot] : []).filter((dir) => gitRoot !== null && isWithin(gitRoot, dir));
+    const contentRoots = gitContentRoots(sources, gitRoot);
     const gitTimes = gitLastModifiedTimes(context.root, contentRoots, fsPaths, gitRoot);
     for (const page of pages) {
       if (!page.lastModified && page.sourcePath) {
@@ -3403,14 +3639,15 @@ var scanProject = async (root, options = {}) => {
     lastModifiedWarnings.push(...lastModifiedShallowWarning(context.root, undated));
   }
   const customPages = context.pagesRoot ? await discoverPages(context.pagesRoot) : [];
+  const extraRoutes = new Set([
+    ...customStaticRoutes(customPages),
+    ...hasChangelogIndex(pages, config) ? [CHANGELOG_INDEX_ROUTE] : []
+  ]);
   const graph = buildContentGraph(pages, {
     bannerHref: bannerLinkHref(config.banner),
     basePath: config.basePath,
     brandHref: logoHref(config.logo),
-    extraRoutes: new Set([
-      ...customStaticRoutes(customPages),
-      ...hasChangelogIndex(pages, config) ? [CHANGELOG_INDEX_ROUTE] : []
-    ]),
+    extraRoutes,
     folderMeta: folderMeta.meta,
     i18n: config.i18n,
     navigation: config.navigation,
@@ -3426,12 +3663,14 @@ var scanProject = async (root, options = {}) => {
     diagnostics: [
       ...contentDiagnostics,
       ...includeDiagnostics,
+      ...variableDiagnostics,
       ...folderMeta.diagnostics,
       ...entryIdDiagnostics(pages, resolveDocsCollection(config, context.root).base),
       ...graph.diagnostics,
       ...i18nWarnings,
       ...versionWarnings,
-      ...lastModifiedWarnings
+      ...lastModifiedWarnings,
+      ...redirectPageDiagnostics(config, [...manifest.routes.map((route) => route.path), ...extraRoutes], context.configFile)
     ],
     droppedPages,
     graph,
@@ -3442,7 +3681,7 @@ var scanProject = async (root, options = {}) => {
   };
 };
 
-export { validateSearchPopularIcons, validateNavTargets, contentIndexable, buildManifest, isWithin, scanProject };
+export { directiveSource, resolveLocalizable, validateSearchPopularIcons, validateNavTargets, contentIndexable, buildManifest, findFolderMetaFiles, isWithin, scanProject };
 
-//# debugId=B3E8BA7A9A3228DD64756E2164756E21
-//# sourceMappingURL=chunk-5r8g91qn.js.map
+//# debugId=89E5C13A316C75D864756E2164756E21
+//# sourceMappingURL=chunk-43zcf4gz.js.map