blume 1.4.0 → 1.4.1

package/src/core/sources/notion.ts

@@ -148,31 +148,25 @@ const SECOND_MS = 1000;
  * many concurrent block-children requests, so without this a single 429 would
  * reject the batch and abort the whole import.
  */
-const withNotionRetry = async <T>(call: () => Promise<T>): Promise<T> => {
-  let lastError: unknown;
-  for (let attempt = 0; attempt <= MAX_RETRIES; attempt += 1) {
-    try {
-      // oxlint-disable-next-line no-await-in-loop, react-doctor/async-await-in-loop -- sequential retry attempts, not independent
-      return await call();
-    } catch (error) {
-      lastError = error;
-      const { status } = error as { status?: number };
-      if (status !== RATE_LIMITED || attempt === MAX_RETRIES) {
-        throw error;
-      }
-      const retryAfter = Number(
-        (error as { headers?: Record<string, string> }).headers?.["retry-after"]
-      );
-      const wait =
-        retryAfter > 0 ? retryAfter * SECOND_MS : BASE_DELAY_MS * 2 ** attempt;
-      // oxlint-disable-next-line no-await-in-loop -- back off before retrying
-      await sleep(wait);
+const withNotionRetry = async <T>(
+  call: () => Promise<T>,
+  attempt = 0
+): Promise<T> => {
+  try {
+    return await call();
+  } catch (error) {
+    const { status } = error as { status?: number };
+    if (status !== RATE_LIMITED || attempt === MAX_RETRIES) {
+      throw error;
     }
+    const retryAfter = Number(
+      (error as { headers?: Record<string, string> }).headers?.["retry-after"]
+    );
+    const wait =
+      retryAfter > 0 ? retryAfter * SECOND_MS : BASE_DELAY_MS * 2 ** attempt;
+    await sleep(wait);
+    return withNotionRetry(call, attempt + 1);
   }
-  // Unreachable — the loop always returns or rethrows — but keeps types honest.
-  throw lastError instanceof Error
-    ? lastError
-    : new Error("Notion request failed after retries.");
 };
 
 /** Paginate a Notion list endpoint via recursion (no await-in-loop). */

package/src/core/tsconfig-aliases.ts

@@ -1,8 +1,7 @@
-import { existsSync, readFileSync, statSync } from "node:fs";
-import { createRequire } from "node:module";
-import { pathToFileURL } from "node:url";
+import { existsSync } from "node:fs";
 
-import { dirname, isAbsolute, join, resolve } from "pathe";
+import { parseTsconfig } from "get-tsconfig";
+import { dirname, join, resolve } from "pathe";
 
 /**
  * Read the project's TypeScript path aliases (`compilerOptions.paths`) and turn
@@ -15,177 +14,28 @@ import { dirname, isAbsolute, join, resolve } from "pathe";
  * import would have to be rewritten to a relative path. Reading the aliases here
  * lets those components port over unchanged.
  *
- * Best-effort and non-fatal: tsconfig is parsed leniently (it is JSONC —
- * comments and trailing commas), a single `extends` chain is followed to the
- * file that actually declares `paths`, and anything unparseable yields no
- * aliases (the prior behavior).
+ * Parsing is get-tsconfig's job — JSONC, the full `extends` chain (relative
+ * paths, directories, package specifiers, TS 5.0 arrays), and the rebasing of
+ * inherited relative paths all follow tsc's own semantics. Best-effort and
+ * non-fatal: anything unparseable yields no aliases.
  */
 
-interface ScanStep {
-  append: string;
-  inString: boolean;
-  next: number;
-}
+/** TS 5.5's config-relative template prefix, literal by design in tsconfig. */
+// oxlint-disable-next-line no-template-curly-in-string -- tsconfig's own syntax
+const CONFIG_DIR_TEMPLATE = "${configDir}";
 
-/** Scan one character (or comment/escape run) starting at `index`. */
-const scanJsonChar = (
-  text: string,
-  index: number,
-  inString: boolean
-): ScanStep => {
-  const char = text[index];
-  if (inString) {
-    if (char === "\\") {
-      return {
-        append: char + (text[index + 1] ?? ""),
-        inString: true,
-        next: index + 2,
-      };
-    }
-    return { append: char ?? "", inString: char !== '"', next: index + 1 };
-  }
-  if (char === '"') {
-    return { append: char, inString: true, next: index + 1 };
-  }
-  if (char === "/" && text[index + 1] === "/") {
-    const newline = text.indexOf("\n", index + 2);
-    return {
-      append: "",
-      inString: false,
-      next: newline === -1 ? text.length : newline,
-    };
-  }
-  if (char === "/" && text[index + 1] === "*") {
-    const end = text.indexOf("*/", index + 2);
-    return {
-      append: "",
-      inString: false,
-      next: end === -1 ? text.length : end + 2,
-    };
-  }
-  return { append: char ?? "", inString: false, next: index + 1 };
-};
-
-/** Strip `//` line and `/* *\/` block comments that sit outside strings. */
-const stripJsonComments = (text: string): string => {
-  let out = "";
-  let inString = false;
-  let index = 0;
-  while (index < text.length) {
-    const {
-      append,
-      inString: nextInString,
-      next,
-    } = scanJsonChar(text, index, inString);
-    out += append;
-    inString = nextInString;
-    index = next;
-  }
-  return out;
-};
-
-const TRAILING_COMMA = /,(?<rest>\s*[}\]])/gu;
-
-/** Parse JSONC (tsconfig) into a plain object, or null if it can't be read. */
-const parseJsonc = (text: string): Record<string, unknown> | null => {
-  try {
-    const cleaned = stripJsonComments(text).replaceAll(
-      TRAILING_COMMA,
-      "$<rest>"
-    );
-    const value: unknown = JSON.parse(cleaned);
-    return value && typeof value === "object" && !Array.isArray(value)
-      ? (value as Record<string, unknown>)
-      : null;
-  } catch {
-    return null;
-  }
-};
-
-const isFile = (path: string): boolean => {
-  try {
-    return statSync(path).isFile();
-  } catch {
-    return false;
-  }
-};
-
-/** Resolve a tsconfig `extends` target (relative path, directory, or package). */
-const resolveExtends = (spec: string, fromDir: string): string | null => {
-  if (spec.startsWith(".") || isAbsolute(spec)) {
-    const candidates = spec.endsWith(".json")
-      ? [resolve(fromDir, spec)]
-      : [
-          resolve(fromDir, `${spec}.json`),
-          resolve(fromDir, spec, "tsconfig.json"),
-          resolve(fromDir, spec),
-        ];
-    return candidates.find(isFile) ?? null;
-  }
-  // A bare specifier points at a package's shared config (e.g. `@tsconfig/*`).
-  try {
-    const requireFromDir = createRequire(
-      pathToFileURL(join(fromDir, "_.js")).href
-    );
-    for (const sub of [`${spec}/tsconfig.json`, spec]) {
-      try {
-        return requireFromDir.resolve(sub);
-      } catch {
-        // try the next candidate
-      }
-    }
-  } catch {
-    // createRequire failed; fall through
-  }
-  return null;
-};
-
-interface LoadedPaths {
-  /** Directory `paths` entries resolve against (`dirname(file)` + `baseUrl`). */
-  baseDir: string;
-  paths: Record<string, unknown>;
-}
-
-/** Find the nearest tsconfig in an `extends` chain that declares `paths`. */
-const loadPaths = (file: string, seen: Set<string>): LoadedPaths | null => {
-  if (seen.has(file) || !existsSync(file)) {
-    return null;
-  }
-  seen.add(file);
-  const json = parseJsonc(readFileSync(file, "utf-8"));
-  if (!json) {
-    return null;
-  }
-  const options = (json.compilerOptions ?? {}) as Record<string, unknown>;
-  if (options.paths && typeof options.paths === "object") {
-    const baseUrl = typeof options.baseUrl === "string" ? options.baseUrl : ".";
-    return {
-      baseDir: resolve(dirname(file), baseUrl),
-      paths: options.paths as Record<string, unknown>,
-    };
-  }
-  // `extends` is a string or, since TS 5.0, an array searched first-to-last.
-  const bases = Array.isArray(json.extends)
-    ? json.extends
-    : [json.extends].filter(Boolean);
-  for (const base of bases) {
-    if (typeof base !== "string") {
-      continue;
-    }
-    const resolved = resolveExtends(base, dirname(file));
-    const found = resolved ? loadPaths(resolved, seen) : null;
-    if (found) {
-      return found;
-    }
-  }
-  return null;
-};
+/** Substitute a leading `${configDir}` template with the config's directory. */
+const substituteConfigDir = (value: string, configDir: string): string =>
+  value.startsWith(CONFIG_DIR_TEMPLATE)
+    ? join(configDir, value.slice(CONFIG_DIR_TEMPLATE.length))
+    : value;
 
 /** Convert one tsconfig `paths` mapping to a Vite alias, or null to skip. */
 const toAlias = (
   key: string,
   value: unknown,
-  baseDir: string
+  baseDir: string,
+  configDir: string
 ): { find: string; replacement: string } | null => {
   // tsconfig allows a fallback array; Vite aliases are 1:1, so take the first.
   const first = Array.isArray(value) ? value[0] : value;
@@ -198,7 +48,10 @@ const toAlias = (
   if (find === "" || find === "*") {
     return null;
   }
-  return { find, replacement: resolve(baseDir, target) };
+  return {
+    find,
+    replacement: resolve(baseDir, substituteConfigDir(target, configDir)),
+  };
 };
 
 /**
@@ -215,13 +68,27 @@ export const resolveTsconfigAliases = (
   if (!entry) {
     return {};
   }
-  const loaded = loadPaths(entry, new Set());
-  if (!loaded) {
+  let options: ReturnType<typeof parseTsconfig>["compilerOptions"];
+  try {
+    options = parseTsconfig(entry).compilerOptions;
+  } catch {
+    // Unparseable config or unresolvable extends: no aliases, as before.
+    return {};
+  }
+  const paths = options?.paths;
+  if (!paths) {
     return {};
   }
+  const configDir = dirname(entry);
+  // get-tsconfig rebases inherited relative values onto the entry config, so
+  // `baseUrl` (and bare `paths` entries) anchor here after substitution.
+  const baseDir = resolve(
+    configDir,
+    substituteConfigDir(options?.baseUrl ?? ".", configDir)
+  );
   const aliases: Record<string, string> = {};
-  for (const [key, value] of Object.entries(loaded.paths)) {
-    const alias = toAlias(key, value, loaded.baseDir);
+  for (const [key, value] of Object.entries(paths)) {
+    const alias = toAlias(key, value, baseDir, configDir);
     if (alias) {
       aliases[alias.find] = alias.replacement;
     }

package/src/deploy/rss.ts

@@ -1,7 +1,10 @@
+// html-escaper's five-entity table is XML-safe: `'` becomes the numeric
+// `'` reference rather than `'`, which XML accepts equally.
+import { escape as escapeXml } from "html-escaper";
+
 import { normalizeBasePath, withBasePath } from "../core/base-path.ts";
 import type { BlumeProject } from "../core/project-graph.ts";
 import type { PageRecord } from "../core/types.ts";
-import { escapeXml } from "./xml.ts";
 
 /** A single feed entry derived from a content page. */
 export interface RssItem {

package/src/deploy/sitemap.ts

@@ -1,3 +1,6 @@
+// html-escaper's five-entity table is XML-safe (`'` → the numeric `'`).
+import { escape as escapeXml } from "html-escaper";
+
 import {
   customStaticRoutes,
   discoverPagesSync,
@@ -5,7 +8,6 @@ import {
 } from "../astro/pages.ts";
 import { normalizeBasePath, withBasePath } from "../core/base-path.ts";
 import type { BlumeProject } from "../core/project-graph.ts";
-import { escapeXml } from "./xml.ts";
 
 /**
  * Astro's reserved error routes. A user-authored override (`pages/404.astro`,

package/src/eval/report.ts

@@ -1,23 +1,14 @@
 import { mkdtemp, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 
+import { colors } from "consola/utils";
+import type { ColorFunction } from "consola/utils";
 import { join, relative } from "pathe";
 
 import { AGENTS } from "../audit/agent.ts";
 import { countBySeverity } from "../core/diagnostics.ts";
 import type { EvalResult, QuestionResult, QuestionStatus } from "./run.ts";
 
-const ESC = String.fromCodePoint(27);
-const COLORS = {
-  bold: `${ESC}[1m`,
-  cyan: `${ESC}[36m`,
-  dim: `${ESC}[2m`,
-  green: `${ESC}[32m`,
-  red: `${ESC}[31m`,
-  reset: `${ESC}[0m`,
-  yellow: `${ESC}[33m`,
-};
-
 const GLYPH: Record<QuestionStatus, string> = {
   error: "!",
   fail: "✖",
@@ -25,11 +16,11 @@ const GLYPH: Record<QuestionStatus, string> = {
   skip: "⊘",
 };
 
-const STATUS_COLOR: Record<QuestionStatus, string> = {
-  error: COLORS.yellow,
-  fail: COLORS.red,
-  pass: COLORS.green,
-  skip: COLORS.dim,
+const STATUS_COLOR: Record<QuestionStatus, ColorFunction> = {
+  error: colors.yellow,
+  fail: colors.red,
+  pass: colors.green,
+  skip: colors.dim,
 };
 
 /** Longest id gets the room; everything shorter aligns to it. */
@@ -52,17 +43,18 @@ const duration = (ms: number): string => {
 /** One question's progress/report line: glyph, id, status, score, time, cost. */
 export const questionLine = (result: QuestionResult): string => {
   const color = STATUS_COLOR[result.status];
-  const glyph = `${color}${GLYPH[result.status]}${COLORS.reset}`;
+  const glyph = color(GLYPH[result.status]);
   const id = result.id.padEnd(ID_PAD);
   if (result.status === "skip") {
-    return `  ${glyph} ${id} ${COLORS.dim}skipped${COLORS.reset}`;
+    return `  ${glyph} ${id} ${colors.dim("skipped")}`;
   }
   const score = result.score === undefined ? "" : result.score.toFixed(2);
+  const cost = money(result.costUsd);
   const cells = [
-    `${color}${result.status}${COLORS.reset}`,
+    color(result.status),
     score,
-    `${COLORS.dim}${seconds(result.durationMs)}${COLORS.reset}`,
-    `${COLORS.dim}${money(result.costUsd)}${COLORS.reset}`,
+    colors.dim(seconds(result.durationMs)),
+    cost === "" ? "" : colors.dim(cost),
   ]
     .filter((cell) => cell !== "")
     .join("  ");
@@ -77,17 +69,17 @@ export const questionDetails = (
   const lines: string[] = [];
   if (result.status === "fail") {
     for (const fact of result.missing) {
-      lines.push(`      ${COLORS.dim}missing: ${fact}${COLORS.reset}`);
+      lines.push(`      ${colors.dim(`missing: ${fact}`)}`);
     }
   }
   if (result.status === "error" && result.detail) {
-    lines.push(`      ${COLORS.dim}${result.detail}${COLORS.reset}`);
+    lines.push(`      ${colors.dim(result.detail)}`);
   }
   if (verbose && result.answer && result.status !== "pass") {
     lines.push(
       ...result.answer
         .split("\n")
-        .map((line) => `      ${COLORS.dim}> ${line}${COLORS.reset}`)
+        .map((line) => `      ${colors.dim(`> ${line}`)}`)
     );
   }
   return lines;
@@ -109,11 +101,11 @@ export const summaryLine = (result: EvalResult): string => {
 
 /** The header line the command prints before the first question runs. */
 export const headerLine = (total: number, agent: EvalResult["agent"]): string =>
-  `${COLORS.bold}blume eval${COLORS.reset}  ${total} question(s) · ${AGENTS[agent].name}`;
+  `${colors.bold("blume eval")}  ${total} question(s) · ${AGENTS[agent].name}`;
 
 /** The dim announce line while a question's agents run. */
 export const startLine = (id: string, index: number, total: number): string =>
-  `  ${COLORS.dim}▸ ${id} (${index + 1}/${total})${COLORS.reset}`;
+  `  ${colors.dim(`▸ ${id} (${index + 1}/${total})`)}`;
 
 /** `fix:` pointers for failed questions, naming the file that resolves each. */
 export const fixLines = (result: EvalResult, root: string): string[] =>
@@ -123,7 +115,7 @@ export const fixLines = (result: EvalResult, root: string): string[] =>
       const site = finding.file
         ? `${relative(root, finding.file)}${finding.line ? `:${finding.line}` : ""}`
         : "";
-      return `  ${COLORS.cyan}fix:${COLORS.reset} ${site} ${COLORS.dim}${finding.message}${COLORS.reset}`;
+      return `  ${colors.cyan("fix:")} ${site} ${colors.dim(finding.message)}`;
     });
 
 /** Dim warnings for route hints that no longer match a page. */
@@ -134,7 +126,7 @@ export const warningLines = (result: EvalResult, root: string): string[] =>
       const site = finding.file
         ? ` ${relative(root, finding.file)}${finding.line ? `:${finding.line}` : ""}`
         : "";
-      return `  ${COLORS.yellow}⚠${COLORS.reset}${site} ${COLORS.dim}${finding.message}${COLORS.reset}`;
+      return `  ${colors.yellow("⚠")}${site} ${colors.dim(finding.message)}`;
     });
 
 /** The human report, written to stderr by the command. */

package/src/markdown/directives.ts

@@ -1,3 +1,5 @@
+import { toString as mdastToString } from "mdast-util-to-string";
+
 import { jsxAttribute, jsxFlowElement } from "./mdast.ts";
 import type { MdastNode, MdastVisitorContext } from "./mdast.ts";
 
@@ -35,23 +37,6 @@ export const calloutTypeFor = (name: string): string | null => {
   return ALIASES[lower] ?? null;
 };
 
-interface TextNode extends MdastNode {
-  value?: string;
-}
-
-/**
- * Concatenate the plain text of a node, recursing through phrasing children so
- * formatted labels keep every word — `:::note[Read **this**]` yields
- * `Read this`, not `Read ` (the bolded run dropped).
- */
-const textOf = (node: MdastNode): string => {
-  const { children } = node as { children?: MdastNode[] };
-  if (children && children.length > 0) {
-    return children.map(textOf).join("");
-  }
-  return (node as TextNode).value ?? "";
-};
-
 /**
  * Satteri MDAST plugin mapping container directives (`:::note`, `:::warning`,
  * `:::tip`, …) onto Blume's `<Callout>` component. The title comes from a
@@ -77,7 +62,10 @@ export const directiveToCalloutPlugin = () => ({
     if (labelIndex !== -1) {
       const [label] = children.splice(labelIndex, 1);
       if (label) {
-        title ??= textOf(label) || undefined;
+        // Flatten the label's phrasing children so `:::note[Read **this**]`
+        // yields `Read this`; image alt is excluded (an image is not label
+        // text), matching the historical child-values-only behavior.
+        title ??= mdastToString(label, { includeImageAlt: false }) || undefined;
       }
     }
 

package/src/markdown/index.ts

@@ -6,6 +6,7 @@ import {
   transformerNotationHighlight,
   transformerNotationWordHighlight,
 } from "@shikijs/transformers";
+import { escape as escapeHtml } from "html-escaper";
 import { codeToHtml } from "shiki";
 
 import { baseLinksPlugin } from "./base-links.ts";
@@ -107,12 +108,6 @@ export const blumeShikiTransformers = (
   return transformers;
 };
 
-const escapeHtml = (value: string): string =>
-  value
-    .replaceAll("&", "&")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;");
-
 /**
  * Tag the highlighted `<pre>` with `astro-code` (plus any extra classes) so the
  * theme's code-block styles apply — `codeToHtml`'s bare output is `pre.shiki`,

package/src/markdown/package-commands.ts

@@ -79,10 +79,6 @@ const normalizeFlags = (args: string[]): string[] =>
  */
 const parseIntent = (input: string): Intent => {
   const tokens = input.trim().split(WHITESPACE).filter(Boolean);
-  if (tokens.length === 0) {
-    return { args: [], operation: "install" };
-  }
-
   const [first, ...rest] = tokens;
   if (first === undefined) {
     return { args: [], operation: "install" };

package/src/openapi/parse.ts

@@ -150,16 +150,18 @@ const fetchSpecText = async (spec: string): Promise<string> => {
     if ("text" in last) {
       return last.text;
     }
-    if (!last.retryable || attempt === MAX_ATTEMPTS - 1) {
-      throw last.error;
+    if (!last.retryable) {
+      break;
+    }
+    if (attempt < MAX_ATTEMPTS - 1) {
+      // oxlint-disable-next-line no-await-in-loop -- back off before retrying
+      await sleep(
+        Math.min(
+          last.retryAfter ?? BASE_BACKOFF_MS * 2 ** attempt,
+          MAX_RETRY_WAIT_MS
+        )
+      );
     }
-    // oxlint-disable-next-line no-await-in-loop -- back off before retrying
-    await sleep(
-      Math.min(
-        last.retryAfter ?? BASE_BACKOFF_MS * 2 ** attempt,
-        MAX_RETRY_WAIT_MS
-      )
-    );
   }
   throw last.error;
 };

package/src/search/popular-icon.ts

@@ -1,3 +1,5 @@
+import { escape } from "html-escaper";
+
 import { prefixBase } from "../components/islands/base-path.ts";
 import { isImageIcon, isInlineSvg } from "../theme/icon-kind.ts";
 import { resolveIcon } from "../theme/icons.ts";
@@ -21,9 +23,7 @@ export const resolvePopularIconMarkup = (
     return `<span aria-hidden="true" style="display:inline-flex;width:16px;height:16px">${icon.trim()}</span>`;
   }
   if (isImageIcon(icon)) {
-    const src = prefixBase(base, icon.trim())
-      .replaceAll("&", "&amp;")
-      .replaceAll('"', "&quot;");
+    const src = escape(prefixBase(base, icon.trim()));
     return `<img src="${src}" width="16" height="16" alt="" aria-hidden="true" class="size-4" />`;
   }
   const resolved = resolveIcon(icon);

package/src/translate/ledger.ts

@@ -1,9 +1,11 @@
 import { createHash } from "node:crypto";
-import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 
-import { dirname, join } from "pathe";
+import { join } from "pathe";
 import { z } from "zod";
 
+import { writeTextAtomic } from "../core/fs-atomic.ts";
+
 /**
  * The committed translation ledger: which source files have been translated
  * into which locales, and at what source content. Named "ledger" to avoid
@@ -98,15 +100,7 @@ export const writeLedger = async (
   if (existing === content) {
     return false;
   }
-  await mkdir(dirname(path), { recursive: true });
-  const tmp = `${path}.${process.pid}.tmp`;
-  await writeFile(tmp, content, "utf-8");
-  try {
-    await rename(tmp, path);
-  } catch (error) {
-    await rm(tmp, { force: true });
-    throw error;
-  }
+  await writeTextAtomic(path, content);
   return true;
 };