blume 1.4.0 → 1.4.2

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;
 };
 

package/src/translate/report.ts

@@ -1,3 +1,6 @@
+import { colors } from "consola/utils";
+import type { ColorFunction } from "consola/utils";
+
 import { AGENTS } from "../audit/agent.ts";
 import type { AgentKind } from "../audit/agent.ts";
 import { countBySeverity } from "../core/diagnostics.ts";
@@ -15,23 +18,15 @@ import type {
 } from "./work-list.ts";
 
 /**
- * The live progress UI, hand-rolled ANSI (no new dependencies), matching the
- * eval report's palette. Render functions are pure; the renderer takes an
- * injectable `write`/`now` so tests never touch a real TTY or clock. The
- * command sends everything here to stderr via the raw `write` — never
- * `logger.info`, which consola drops in test and CI environments.
+ * The live progress UI, colored via consola's `colors` (which honors
+ * NO_COLOR/FORCE_COLOR and TTY detection), matching the eval report's palette.
+ * Render functions are pure; the renderer takes an injectable `write`/`now` so
+ * tests never touch a real TTY or clock. The command sends everything here to
+ * stderr via the raw `write` — never `logger.info`, which consola drops in
+ * test and CI environments.
  */
 
 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<TranslateItemStatus, string> = {
   failed: "✖",
@@ -39,10 +34,10 @@ const GLYPH: Record<TranslateItemStatus, string> = {
   translated: "✔",
 };
 
-const STATUS_COLOR: Record<TranslateItemStatus, string> = {
-  failed: COLORS.red,
-  partial: COLORS.yellow,
-  translated: COLORS.green,
+const STATUS_COLOR: Record<TranslateItemStatus, ColorFunction> = {
+  failed: colors.red,
+  partial: colors.yellow,
+  translated: colors.green,
 };
 
 export const SPINNER_FRAMES = [
@@ -96,23 +91,23 @@ export const spinnerLine = (
 ): string => {
   const first = active[0] as WorkItem;
   const more = active.length > 1 ? ` (+${active.length - 1} more)` : "";
-  return `  ${COLORS.cyan}${SPINNER_FRAMES[frame % SPINNER_FRAMES.length]}${COLORS.reset} ${itemLabel(first)}${more} ${COLORS.dim}${done}/${total}${COLORS.reset}`;
+  return `  ${colors.cyan(SPINNER_FRAMES[frame % SPINNER_FRAMES.length] as string)} ${itemLabel(first)}${more} ${colors.dim(`${done}/${total}`)}`;
 };
 
 /** The permanent line printed when an item finishes. */
 export const itemEndLine = (result: TranslateItemResult): string => {
   const color = STATUS_COLOR[result.status];
-  const glyph = `${color}${GLYPH[result.status]}${COLORS.reset}`;
+  const glyph = color(GLYPH[result.status]);
   const label = itemLabel(result.item);
   if (result.status === "translated") {
     const cells = [seconds(result.durationMs), money(result.costUsd)]
       .filter((cell) => cell !== "")
       .join(" ");
-    return `  ${glyph} ${label} ${COLORS.dim}${cells}${COLORS.reset}`;
+    return `  ${glyph} ${label} ${colors.dim(cells)}`;
   }
   const word = result.status === "partial" ? "partial" : "failed";
-  return `  ${glyph} ${label} ${color}${word}${COLORS.reset}${
-    result.detail ? `${COLORS.dim}: ${result.detail}${COLORS.reset}` : ""
+  return `  ${glyph} ${label} ${color(word)}${
+    result.detail ? colors.dim(`: ${result.detail}`) : ""
   }`;
 };
 
@@ -122,7 +117,7 @@ export const translateHeaderLine = (
   localeCount: number,
   agent: AgentKind
 ): string =>
-  `${COLORS.bold}blume translate${COLORS.reset}  ${itemCount} item(s) · ${localeCount} locale(s) · ${AGENTS[agent].name}`;
+  `${colors.bold("blume translate")}  ${itemCount} item(s) · ${localeCount} locale(s) · ${AGENTS[agent].name}`;
 
 /**
  * `Translated 11 files into 2 locales · 1 failed · 2 adopted · 8 already up to
@@ -148,8 +143,7 @@ export const translateSummaryLine = (
 /** Dim warnings for work-list diagnostics (e.g. a factory-form meta file). */
 export const diagnosticLines = (diagnostics: Diagnostic[]): string[] =>
   diagnostics.map(
-    (diagnostic) =>
-      `  ${COLORS.yellow}⚠${COLORS.reset} ${COLORS.dim}${diagnostic.message}${COLORS.reset}`
+    (diagnostic) => `  ${colors.yellow("⚠")} ${colors.dim(diagnostic.message)}`
   );
 
 /** Every (source, locale, status) drift row in a work list, pages then meta. */
@@ -176,11 +170,11 @@ const driftRows = (
 export const checkLines = (workList: TranslateWorkList): string[] => [
   ...driftRows(workList).map(
     (row) =>
-      `  ${COLORS.red}✖${COLORS.reset} ${row.sourceRel} → ${row.locale} ${COLORS.dim}${row.status}${COLORS.reset}`
+      `  ${colors.red("✖")} ${row.sourceRel} → ${row.locale} ${colors.dim(row.status)}`
   ),
   ...workList.untracked.map(
     (entry) =>
-      `  ${COLORS.dim}⊘ ${entry.sourceRel} → ${entry.locale} untracked (adopted by the next translate run)${COLORS.reset}`
+      `  ${colors.dim(`⊘ ${entry.sourceRel} → ${entry.locale} untracked (adopted by the next translate run)`)}`
   ),
 ];
 

package/src/translate/run.ts

@@ -1,18 +1,12 @@
 import { existsSync } from "node:fs";
-import {
-  mkdir,
-  mkdtemp,
-  readFile,
-  rename,
-  rm,
-  writeFile,
-} from "node:fs/promises";
+import { mkdtemp, readFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 
-import { dirname, join } from "pathe";
+import { join } from "pathe";
 
 import { AGENTS, WINDOWS_COMMAND_NOT_FOUND } from "../audit/agent.ts";
 import type { AgentKind } from "../audit/agent.ts";
+import { writeTextAtomic } from "../core/fs-atomic.ts";
 import type { BlumeProject } from "../core/project-graph.ts";
 import type { LocaleConfig } from "../core/schema.ts";
 import type { Diagnostic } from "../core/types.ts";
@@ -94,19 +88,6 @@ interface RunContext {
 /** The root directory's key in a meta-titles prompt (an empty key is opaque). */
 const metaDirKey = (dir: string): string => (dir === "" ? "." : dir);
 
-/** Write atomically (temp + rename) so a watcher never sees a partial file. */
-const writeFileAtomic = async (path: string, text: string): Promise<void> => {
-  await mkdir(dirname(path), { recursive: true });
-  const tmp = `${path}.${process.pid}.tmp`;
-  await writeFile(tmp, text, "utf-8");
-  try {
-    await rename(tmp, path);
-  } catch (error) {
-    await rm(tmp, { force: true });
-    throw error;
-  }
-};
-
 /**
  * One headless agent call. A Windows shell launch reports a missing executable
  * through exit code 9009 instead of a spawn error, so that is normalized to
@@ -172,7 +153,7 @@ const runPageItem = async (
   if (!validated.ok) {
     return done("failed", validated.reason, output.costUsd);
   }
-  await writeFileAtomic(item.targetPath, validated.text);
+  await writeTextAtomic(item.targetPath, validated.text);
   stampLedger(ledger, item.sourceRel, item.locale, hashSource(sourceText));
   return done("translated", undefined, output.costUsd);
 };
@@ -218,7 +199,7 @@ const runMetaItem = async (
     // Each entry writes and stamps independently, so a partially usable reply
     // still lands the titles it did translate.
     // oxlint-disable-next-line no-await-in-loop
-    await writeFileAtomic(
+    await writeTextAtomic(
       entry.targetPath,
       generateMetaModule(entry.meta.data, translated)
     );

package/src/deploy/xml.ts

@@ -1,8 +0,0 @@
-/** Escape a string for safe inclusion in XML text or attribute content. */
-export const escapeXml = (value: string): string =>
-  value
-    .replaceAll("&", "&")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;")
-    .replaceAll('"', "&quot;")
-    .replaceAll("'", "&apos;");